From 8bf19a69f89ad972dfe0daafa6bce6cfdd1e0e32 Mon Sep 17 00:00:00 2001
From: carm <carm@carmwork.com>
Date: Fri, 17 Sep 2021 08:45:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=AF=E8=83=BD=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E6=8A=A5=E9=94=99=E7=9A=84PlaceholderAPI=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/cc/carm/plugin/userprefix/Main.java     |  3 ++-
 .../cc/carm/plugin/userprefix/util/MessageUtil.java   | 11 ++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/cc/carm/plugin/userprefix/Main.java b/src/main/java/cc/carm/plugin/userprefix/Main.java
index d9b3ecf..a473bea 100644
--- a/src/main/java/cc/carm/plugin/userprefix/Main.java
+++ b/src/main/java/cc/carm/plugin/userprefix/Main.java
@@ -11,6 +11,7 @@ import cc.carm.plugin.userprefix.manager.PrefixManager;
 import cc.carm.plugin.userprefix.manager.ServiceManager;
 import cc.carm.plugin.userprefix.manager.UserManager;
 import cc.carm.plugin.userprefix.util.ColorParser;
+import cc.carm.plugin.userprefix.util.MessageUtil;
 import net.luckperms.api.event.user.UserDataRecalculateEvent;
 import org.bukkit.Bukkit;
 import org.bukkit.event.Listener;
@@ -39,7 +40,7 @@ public class Main extends JavaPlugin {
         regListener(new UserListener());
         ServiceManager.getService().getEventBus().subscribe(this, UserDataRecalculateEvent.class, UserNodeUpdateProcessor::process);
 
-        if (Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null) {
+        if (MessageUtil.hasPlaceholderAPI()) {
             log("注册变量...");
             new UserPrefixExpansion(getInstance()).register();
         } else {
diff --git a/src/main/java/cc/carm/plugin/userprefix/util/MessageUtil.java b/src/main/java/cc/carm/plugin/userprefix/util/MessageUtil.java
index 45f0974..77171a6 100644
--- a/src/main/java/cc/carm/plugin/userprefix/util/MessageUtil.java
+++ b/src/main/java/cc/carm/plugin/userprefix/util/MessageUtil.java
@@ -1,12 +1,17 @@
 package cc.carm.plugin.userprefix.util;
 
 import me.clip.placeholderapi.PlaceholderAPI;
+import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
 import java.util.*;
 
 public class MessageUtil {
 
+    public static boolean hasPlaceholderAPI() {
+        return Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null;
+    }
+
     public static void send(Player player, List<String> messages) {
         for (String s : messages) {
             player.sendMessage(ColorParser.parseColor(s));
@@ -22,7 +27,11 @@ public class MessageUtil {
     }
 
     public static void sendWithPlaceholders(Player player, List<String> messages) {
-        send(player, PlaceholderAPI.setPlaceholders(player, messages));
+        if (hasPlaceholderAPI()) {
+            send(player, PlaceholderAPI.setPlaceholders(player, messages));
+        } else {
+            send(player, messages);
+        }
     }
 
     public static void sendWithPlaceholders(Player player, List<String> messages, String param, Object value) {