carm/UserPrefix
1
Fork 0
mirror of https://github.com/CarmJos/UserPrefix.git synced 2026-06-05 00:35:02 +08:00
Code Issues Releases Activity

修复可能导致报错的PlaceholderAPI问题

Browse Source
This commit is contained in:
carm
2021-09-17 08:45:36 +08:00
parent 5d4b131a13
commit 8bf19a69f8
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/cc/carm/plugin/userprefix/Main.java
+2 -1
View File
@@ -11,6 +11,7 @@ import cc.carm.plugin.userprefix.manager.PrefixManager;
import cc.carm.plugin.userprefix.manager.ServiceManager; import cc.carm.plugin.userprefix.manager.ServiceManager;
import cc.carm.plugin.userprefix.manager.UserManager; import cc.carm.plugin.userprefix.manager.UserManager;
import cc.carm.plugin.userprefix.util.ColorParser; import cc.carm.plugin.userprefix.util.ColorParser;
import cc.carm.plugin.userprefix.util.MessageUtil;
import net.luckperms.api.event.user.UserDataRecalculateEvent; import net.luckperms.api.event.user.UserDataRecalculateEvent;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
@@ -39,7 +40,7 @@ public class Main extends JavaPlugin {
regListener(new UserListener()); regListener(new UserListener());
ServiceManager.getService().getEventBus().subscribe(this, UserDataRecalculateEvent.class, UserNodeUpdateProcessor::process); ServiceManager.getService().getEventBus().subscribe(this, UserDataRecalculateEvent.class, UserNodeUpdateProcessor::process);
if (Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null) { if (MessageUtil.hasPlaceholderAPI()) {
log("注册变量..."); log("注册变量...");
new UserPrefixExpansion(getInstance()).register(); new UserPrefixExpansion(getInstance()).register();
} else { } else {
src/main/java/cc/carm/plugin/userprefix/util/MessageUtil.java
+10 -1
View File
@@ -1,12 +1,17 @@
package cc.carm.plugin.userprefix.util; package cc.carm.plugin.userprefix.util;
import me.clip.placeholderapi.PlaceholderAPI; import me.clip.placeholderapi.PlaceholderAPI;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import java.util.*; import java.util.*;
public class MessageUtil { public class MessageUtil {
public static boolean hasPlaceholderAPI() {
return Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null;
}
public static void send(Player player, List<String> messages) { public static void send(Player player, List<String> messages) {
for (String s : messages) { for (String s : messages) {
player.sendMessage(ColorParser.parseColor(s)); player.sendMessage(ColorParser.parseColor(s));
@@ -22,7 +27,11 @@ public class MessageUtil {
} }
public static void sendWithPlaceholders(Player player, List<String> messages) { 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) { public static void sendWithPlaceholders(Player player, List<String> messages, String param, Object value) {