From fa1f85698a96ddeaec352ce72da1699e551045fd Mon Sep 17 00:00:00 2001
From: games647 <games647@users.noreply.github.com>
Date: Fri, 31 Jul 2020 17:01:30 +0200
Subject: [PATCH] Fix NoSuchMethodError for PlaceholderAPI after breaking
 change

Fixes #386
---
 bukkit/pom.xml                                        |  2 +-
 .../games647/fastlogin/bukkit/FastLoginBukkit.java    | 11 ++++++-----
 .../games647/fastlogin/bukkit/PremiumPlaceholder.java |  9 ++-------
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/bukkit/pom.xml b/bukkit/pom.xml
index 1d1e1edf..473f87f6 100644
--- a/bukkit/pom.xml
+++ b/bukkit/pom.xml
@@ -137,7 +137,7 @@
         <dependency>
             <groupId>me.clip</groupId>
             <artifactId>placeholderapi</artifactId>
-            <version>2.10.6</version>
+            <version>2.10.7</version>
             <scope>provided</scope>
             <optional>true</optional>
             <exclusions>
diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java
index e1501e82..03943e2b 100644
--- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java
+++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java
@@ -40,6 +40,8 @@ public class FastLoginBukkit extends JavaPlugin implements PlatformPlugin<Comman
     private final BukkitScheduler scheduler;
     private FastLoginCore<Player, CommandSender, FastLoginBukkit> core;
 
+    private PremiumPlaceholder premiumPlaceholder;
+
     public FastLoginBukkit() {
         this.logger = CommonUtil.createLoggerFromJDK(getLogger());
         this.scheduler = new BukkitScheduler(this, logger, getThreadFactory());
@@ -89,7 +91,8 @@ public class FastLoginBukkit extends JavaPlugin implements PlatformPlugin<Comman
         getCommand("cracked").setExecutor(new CrackedCommand(this));
 
         if (pluginManager.isPluginEnabled("PlaceholderAPI")) {
-            new PremiumPlaceholder(this).register();
+            premiumPlaceholder = new PremiumPlaceholder(this);
+            premiumPlaceholder.register();
         }
     }
 
@@ -103,8 +106,8 @@ public class FastLoginBukkit extends JavaPlugin implements PlatformPlugin<Comman
         }
 
         bungeeManager.cleanup();
-        if (getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) {
-            PremiumPlaceholder.unregisterAll(this);
+        if (getServer().getPluginManager().isPluginEnabled("PlaceholderAPI") && premiumPlaceholder != null) {
+            premiumPlaceholder.unregister();
         }
     }
 
@@ -151,9 +154,7 @@ public class FastLoginBukkit extends JavaPlugin implements PlatformPlugin<Comman
      * @param onlinePlayer
      * @return the online status or unknown if an error happened, the player isn't online or BungeeCord doesn't send
      * us the status message yet (This means you cannot check the login status on the PlayerJoinEvent).
-     * @deprecated this method could be removed in future versions and exists only as a temporarily solution
      */
-    @Deprecated
     public PremiumStatus getStatus(UUID onlinePlayer) {
         return premiumPlayers.getOrDefault(onlinePlayer, PremiumStatus.UNKNOWN);
     }
diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/PremiumPlaceholder.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/PremiumPlaceholder.java
index e4583bd8..8c79e83b 100644
--- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/PremiumPlaceholder.java
+++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/PremiumPlaceholder.java
@@ -1,9 +1,8 @@
 package com.github.games647.fastlogin.bukkit;
 
-import me.clip.placeholderapi.PlaceholderAPI;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 
-import org.bukkit.entity.Player;
+import org.bukkit.OfflinePlayer;
 
 public class PremiumPlaceholder extends PlaceholderExpansion {
 
@@ -15,12 +14,8 @@ public class PremiumPlaceholder extends PlaceholderExpansion {
         this.plugin = plugin;
     }
 
-    public static void unregisterAll(FastLoginBukkit plugin) {
-        PlaceholderAPI.unregisterPlaceholderHook(plugin.getName());
-    }
-
     @Override
-    public String onPlaceholderRequest(Player player, String identifier) {
+    public String onRequest(OfflinePlayer player, String identifier) {
         // player is null if offline
         if (player != null && PLACEHOLDER_VARIABLE.equals(identifier)) {
             return plugin.getStatus(player.getUniqueId()).getReadableName();