Fix parsing of placeholder status

Fixes #341
2020-05-14 13:41:32 +02:00
parent 477d3df1dd
commit c58eda983a
5 changed files with 34 additions and 21 deletions
@@ -89,8 +89,7 @@ public class FastLoginBukkit extends JavaPlugin implements PlatformPlugin<Comman
        getCommand("cracked").setExecutor(new CrackedCommand(this));

        if (pluginManager.isPluginEnabled("PlaceholderAPI")) {
-            //prevents NoClassDef errors if it's not available
-            PremiumPlaceholder.register(this);
+            new PremiumPlaceholder(this).register();
        }
    }

@@ -1,13 +1,12 @@
 package com.github.games647.fastlogin.bukkit;

-import me.clip.placeholderapi.PlaceholderAPI;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;

 import org.bukkit.entity.Player;

 public class PremiumPlaceholder extends PlaceholderExpansion {

-    private static final String PLACEHOLDER_VARIABLE = "fastlogin_status";
+    private static final String PLACEHOLDER_VARIABLE = "status";

    private final FastLoginBukkit plugin;

@@ -15,27 +14,23 @@ public class PremiumPlaceholder extends PlaceholderExpansion {
        this.plugin = plugin;
    }

-    public static void register(FastLoginBukkit plugin) {
-        PremiumPlaceholder placeholderHook = new PremiumPlaceholder(plugin);
-        PlaceholderAPI.registerPlaceholderHook(PLACEHOLDER_VARIABLE, placeholderHook);
-    }
-
    @Override
-    public String onPlaceholderRequest(Player player, String variable) {
-        if (player != null && PLACEHOLDER_VARIABLE.equals(variable)) {
-            return plugin.getStatus(player.getUniqueId()).name();
+    public String onPlaceholderRequest(Player player, String identifier) {
+        // player is null if offline
+        if (player != null && PLACEHOLDER_VARIABLE.equals(identifier)) {
+            return plugin.getStatus(player.getUniqueId()).getReadableName();
        }

-        return "";
+        return null;
    }

    @Override
    public String getIdentifier() {
-        return PLACEHOLDER_VARIABLE;
+        return plugin.getName();
    }

    @Override
-    public String getPlugin() {
+    public String getRequiredPlugin() {
        return plugin.getName();
    }

@@ -46,6 +41,6 @@ public class PremiumPlaceholder extends PlaceholderExpansion {

    @Override
    public String getVersion() {
-        return plugin.getName();
+        return plugin.getDescription().getVersion();
    }
 }