From a6d310d78b33bc6480e20cb915ccb4d700265537 Mon Sep 17 00:00:00 2001 From: LoJoSho Date: Tue, 13 Dec 2022 20:45:38 -0600 Subject: [PATCH] Register PAPI (wip) --- .../com/hibiscusmc/hmccosmetics/HMCCosmeticsPlugin.java | 6 ++++++ .../java/com/hibiscusmc/hmccosmetics/hooks/PAPIHook.java | 5 ++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/HMCCosmeticsPlugin.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/HMCCosmeticsPlugin.java index 27d93f77..56f805f5 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/HMCCosmeticsPlugin.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/HMCCosmeticsPlugin.java @@ -11,6 +11,7 @@ import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic; import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetics; import com.hibiscusmc.hmccosmetics.database.Database; import com.hibiscusmc.hmccosmetics.gui.Menus; +import com.hibiscusmc.hmccosmetics.hooks.PAPIHook; import com.hibiscusmc.hmccosmetics.hooks.items.ItemHooks; import com.hibiscusmc.hmccosmetics.listener.PlayerConnectionListener; import com.hibiscusmc.hmccosmetics.listener.PlayerGameListener; @@ -68,6 +69,11 @@ public final class HMCCosmeticsPlugin extends JavaPlugin { // Database new Database(); + + // PAPI + if (Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null) { + new PAPIHook().register(); + } } @Override diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/PAPIHook.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/PAPIHook.java index 88f7d6e7..75f850d2 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/PAPIHook.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/PAPIHook.java @@ -29,9 +29,8 @@ public class PAPIHook extends PlaceholderExpansion { @Override public String onRequest(OfflinePlayer player, String params) { final String[] parts = params.split("_"); - if (parts.length == 0) { - return null; - } + if (parts.length == 0) return null; + CosmeticUser user = CosmeticUsers.getUser(player.getUniqueId()); if (user == null) return null;