Fix spigot whitelist command on newer Paper versions

spigot/src/main/java/org/geysermc/floodgate/util/SpigotCommandUtil.java

@@ -27,6 +27,7 @@
 
 import java.util.Collection;
 import java.util.UUID;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -122,11 +123,23 @@ public void kickPlayer(Object player, String message) {
 
     @Override
     public boolean whitelistPlayer(UUID uuid, String username) {
-        return WhitelistUtils.addPlayer(uuid, username);
+        return WhitelistUtils.addPlayer(uuid, username, this);
     }
 
     @Override
     public boolean removePlayerFromWhitelist(UUID uuid, String username) {
-        return WhitelistUtils.removePlayer(uuid, username);
+        return WhitelistUtils.removePlayer(uuid, username, this);
+    }
+
+    public void setWhitelist(Object offlinePlayer, Boolean isWhitelisted) {
+        Runnable runnable = new Runnable() {
+            @Override
+            public void run() {
+                OfflinePlayer player = (OfflinePlayer)offlinePlayer;
+                player.setWhitelisted(isWhitelisted);
+            }
+        };
+
+        versionSpecificMethods.maybeSchedule(runnable);
     }
 }

spigot/src/main/java/org/geysermc/floodgate/util/WhitelistUtils.java

@@ -25,54 +25,64 @@
 
 package org.geysermc.floodgate.util;
 
+import static org.bukkit.Bukkit.getServer;
+
 import com.mojang.authlib.GameProfile;
 import java.util.UUID;
-import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 
+
+
 @SuppressWarnings("ConstantConditions")
 public final class WhitelistUtils {
 
     /**
      * Whitelist the given Bedrock player.
      *
-     * @param uuid     the UUID of the Bedrock player to be whitelisted
-     * @param username the username of the Bedrock player to be whitelisted
+     * @param uuid              the UUID of the Bedrock player to be whitelisted
+     * @param username          the username of the Bedrock player to be whitelisted
+     * @param spigotCommandUtil
      * @return true if the player has been whitelisted, false if the player is already whitelisted
      */
-    public static boolean addPlayer(UUID uuid, String username) {
+    public static boolean addPlayer(UUID uuid, String username, SpigotCommandUtil spigotCommandUtil) {
         GameProfile profile = new GameProfile(uuid, username);
 
         OfflinePlayer player = ReflectionUtils.newInstance(
                 ClassNames.CRAFT_OFFLINE_PLAYER_CONSTRUCTOR,
-                Bukkit.getServer(), profile
+                getServer(), profile
         );
         if (player.isWhitelisted()) {
             return false;
         }
-        player.setWhitelisted(true);
+
+        spigotCommandUtil.setWhitelist(player, true);
+
         return true;
     }
 
     /**
      * Removes the given Bedrock player from the whitelist.
      *
-     * @param uuid     the UUID of the Bedrock player to be removed
-     * @param username the username of the Bedrock player to be removed
+     * @param uuid              the UUID of the Bedrock player to be removed
+     * @param username          the username of the Bedrock player to be removed
+     * @param spigotCommandUtil
      * @return true if the player has been removed from the whitelist, false if the player wasn't
      * whitelisted
      */
-    public static boolean removePlayer(UUID uuid, String username) {
+    public static boolean removePlayer(UUID uuid, String username,
+                                       SpigotCommandUtil spigotCommandUtil) {
         GameProfile profile = new GameProfile(uuid, username);
 
         OfflinePlayer player = ReflectionUtils.newInstance(
                 ClassNames.CRAFT_OFFLINE_PLAYER_CONSTRUCTOR,
-                Bukkit.getServer(), profile
+                getServer(), profile
         );
         if (!player.isWhitelisted()) {
             return false;
         }
-        player.setWhitelisted(false);
+
+        spigotCommandUtil.setWhitelist(player, false);
+
         return true;
     }
 }