fix(papi): 消息文件不在强制要求依赖PlaceholderAPI

carm-outsource · Mar 17, 2023 · 21e3fc1 · 21e3fc1
1 parent b35ac8e
commit 21e3fc1
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/src/main/java/cc/carm/plugin/moeteleport/conf/PluginMessages.java b/src/main/java/cc/carm/plugin/moeteleport/conf/PluginMessages.java
@@ -3,17 +3,16 @@
 import cc.carm.lib.configuration.core.ConfigurationRoot;
 import cc.carm.lib.configuration.core.annotation.HeaderComment;
 import cc.carm.lib.easyplugin.utils.ColorParser;
+import cc.carm.lib.easyplugin.utils.MessageUtils;
 import cc.carm.lib.mineconfiguration.bukkit.builder.message.CraftMessageListBuilder;
 import cc.carm.lib.mineconfiguration.bukkit.builder.message.CraftMessageValueBuilder;
 import cc.carm.lib.mineconfiguration.bukkit.builder.title.TitleConfigBuilder;
 import cc.carm.lib.mineconfiguration.bukkit.value.ConfiguredMessage;
 import cc.carm.lib.mineconfiguration.bukkit.value.ConfiguredMessageList;
 import cc.carm.lib.mineconfiguration.bukkit.value.ConfiguredTitle;
 import de.themoep.minedown.MineDown;
-import me.clip.placeholderapi.PlaceholderAPI;
 import net.md_5.bungee.api.chat.BaseComponent;
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.function.BiFunction;
@@ -42,10 +41,7 @@ public class PluginMessages extends ConfigurationRoot {
     }
 
     public static @NotNull BiFunction<CommandSender, String, BaseComponent[]> getParser() {
-        return (sender, message) -> {
-            if (sender instanceof Player) message = PlaceholderAPI.setPlaceholders((Player) sender, message);
-            return MineDown.parse(ColorParser.parse(message));
-        };
+        return (sender, message) -> MineDown.parse(ColorParser.parse(MessageUtils.setPlaceholders(sender, message)));
     }
 
     public static final ConfiguredMessageList<BaseComponent[]> NO_PERMISSION = list().defaults(