From 21e3fc1674a285a27f3fd1c0627c73a43211d2e0 Mon Sep 17 00:00:00 2001 From: carm Date: Fri, 17 Mar 2023 18:02:20 +0800 Subject: [PATCH] =?UTF-8?q?fix(papi):=20=E6=B6=88=E6=81=AF=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E4=B8=8D=E5=9C=A8=E5=BC=BA=E5=88=B6=E8=A6=81=E6=B1=82?= =?UTF-8?q?=E4=BE=9D=E8=B5=96PlaceholderAPI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cc/carm/plugin/moeteleport/conf/PluginMessages.java | 8 ++------ 1 file changed, 2 insertions(+), 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 index c5d3077..621cc2c 100644 --- a/src/main/java/cc/carm/plugin/moeteleport/conf/PluginMessages.java +++ b/src/main/java/cc/carm/plugin/moeteleport/conf/PluginMessages.java @@ -3,6 +3,7 @@ package cc.carm.plugin.moeteleport.conf; 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; @@ -10,10 +11,8 @@ 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 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 NO_PERMISSION = list().defaults(