From af83604c946686d9b30c59f89d6c8736c09a9696 Mon Sep 17 00:00:00 2001
From: Smart123s <28480228+Smart123s@users.noreply.github.com>
Date: Sun, 20 Jun 2021 09:42:40 +0200
Subject: [PATCH] Remove existing Floodgate integration from Bungee

---
 .../fastlogin/bungee/FastLoginBungee.java     |  9 +-----
 .../bungee/hook/floodgate/FloodgateHook.java  |  9 ------
 .../hook/floodgate/FloodgateV1Hook.java       | 14 ---------
 .../hook/floodgate/FloodgateV2Hook.java       | 21 --------------
 .../bungee/listener/ConnectListener.java      | 29 ++-----------------
 5 files changed, 3 insertions(+), 79 deletions(-)
 delete mode 100644 bungee/src/main/java/com/github/games647/fastlogin/bungee/hook/floodgate/FloodgateHook.java
 delete mode 100644 bungee/src/main/java/com/github/games647/fastlogin/bungee/hook/floodgate/FloodgateV1Hook.java
 delete mode 100644 bungee/src/main/java/com/github/games647/fastlogin/bungee/hook/floodgate/FloodgateV2Hook.java

diff --git a/bungee/src/main/java/com/github/games647/fastlogin/bungee/FastLoginBungee.java b/bungee/src/main/java/com/github/games647/fastlogin/bungee/FastLoginBungee.java
index 9f4a598c..65a9cfae 100644
--- a/bungee/src/main/java/com/github/games647/fastlogin/bungee/FastLoginBungee.java
+++ b/bungee/src/main/java/com/github/games647/fastlogin/bungee/FastLoginBungee.java
@@ -86,14 +86,7 @@ public class FastLoginBungee extends Plugin implements PlatformPlugin<CommandSen
         //events
         PluginManager pluginManager = getProxy().getPluginManager();
 
-        //check Floodgate version
-        String floodgateVersion = "0";
-        Plugin floodgatePlugin = pluginManager.getPlugin("floodgate");
-        if (floodgatePlugin != null) {
-            floodgateVersion = floodgatePlugin.getDescription().getVersion();
-        }
-
-        ConnectListener connectListener = new ConnectListener(this, core.getRateLimiter(), floodgateVersion);
+        ConnectListener connectListener = new ConnectListener(this, core.getRateLimiter());
 
         pluginManager.registerListener(this, connectListener);
         pluginManager.registerListener(this, new PluginMessageListener(this));
diff --git a/bungee/src/main/java/com/github/games647/fastlogin/bungee/hook/floodgate/FloodgateHook.java b/bungee/src/main/java/com/github/games647/fastlogin/bungee/hook/floodgate/FloodgateHook.java
deleted file mode 100644
index c6dad54b..00000000
--- a/bungee/src/main/java/com/github/games647/fastlogin/bungee/hook/floodgate/FloodgateHook.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.github.games647.fastlogin.bungee.hook.floodgate;
-
-import java.util.UUID;
-
-public interface FloodgateHook {
-
-    boolean isBedrockPlayer(UUID uuid);
-
-}
diff --git a/bungee/src/main/java/com/github/games647/fastlogin/bungee/hook/floodgate/FloodgateV1Hook.java b/bungee/src/main/java/com/github/games647/fastlogin/bungee/hook/floodgate/FloodgateV1Hook.java
deleted file mode 100644
index bc41956d..00000000
--- a/bungee/src/main/java/com/github/games647/fastlogin/bungee/hook/floodgate/FloodgateV1Hook.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.github.games647.fastlogin.bungee.hook.floodgate;
-
-import org.geysermc.floodgate.FloodgateAPI;
-
-import java.util.UUID;
-
-public class FloodgateV1Hook implements FloodgateHook {
-
-    @Override
-    public boolean isBedrockPlayer(UUID uuid) {
-        return FloodgateAPI.isBedrockPlayer(uuid);
-    }
-
-}
diff --git a/bungee/src/main/java/com/github/games647/fastlogin/bungee/hook/floodgate/FloodgateV2Hook.java b/bungee/src/main/java/com/github/games647/fastlogin/bungee/hook/floodgate/FloodgateV2Hook.java
deleted file mode 100644
index 11e5022c..00000000
--- a/bungee/src/main/java/com/github/games647/fastlogin/bungee/hook/floodgate/FloodgateV2Hook.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.github.games647.fastlogin.bungee.hook.floodgate;
-
-import org.geysermc.floodgate.api.FloodgateApi;
-import org.geysermc.floodgate.api.InstanceHolder;
-
-import java.util.UUID;
-
-public class FloodgateV2Hook implements FloodgateHook {
-
-    private FloodgateApi floodgateApi;
-
-    public FloodgateV2Hook() {
-        this.floodgateApi = InstanceHolder.getApi();
-    }
-
-    @Override
-    public boolean isBedrockPlayer(UUID uuid) {
-        return floodgateApi.isFloodgatePlayer(uuid);
-    }
-
-}
diff --git a/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/ConnectListener.java b/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/ConnectListener.java
index 90ddd944..f11794c7 100644
--- a/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/ConnectListener.java
+++ b/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/ConnectListener.java
@@ -28,9 +28,6 @@ package com.github.games647.fastlogin.bungee.listener;
 import com.github.games647.craftapi.UUIDAdapter;
 import com.github.games647.fastlogin.bungee.BungeeLoginSession;
 import com.github.games647.fastlogin.bungee.FastLoginBungee;
-import com.github.games647.fastlogin.bungee.hook.floodgate.FloodgateHook;
-import com.github.games647.fastlogin.bungee.hook.floodgate.FloodgateV1Hook;
-import com.github.games647.fastlogin.bungee.hook.floodgate.FloodgateV2Hook;
 import com.github.games647.fastlogin.bungee.task.AsyncPremiumCheck;
 import com.github.games647.fastlogin.bungee.task.ForceLoginTask;
 import com.github.games647.fastlogin.core.RateLimiter;
@@ -96,26 +93,16 @@ public class ConnectListener implements Listener {
     private final FastLoginBungee plugin;
     private final RateLimiter rateLimiter;
     private final Property[] emptyProperties = {};
-    private final FloodgateHook floodgateHook;
 
-    public ConnectListener(FastLoginBungee plugin, RateLimiter rateLimiter, String floodgateVersion) {
+    public ConnectListener(FastLoginBungee plugin, RateLimiter rateLimiter) {
         this.plugin = plugin;
         this.rateLimiter = rateLimiter;
-
-        // Get the appropriate floodgate api hook based on the version
-        if (floodgateVersion.startsWith("1")) {
-            this.floodgateHook = new FloodgateV1Hook();
-        } else if (floodgateVersion.startsWith("2")) {
-            this.floodgateHook = new FloodgateV2Hook();
-        } else {
-            this.floodgateHook = null;
-        }
     }
 
     @EventHandler
     public void onPreLogin(PreLoginEvent preLoginEvent) {
         PendingConnection connection = preLoginEvent.getConnection();
-        if (preLoginEvent.isCancelled() || isBedrockPlayer(connection.getUniqueId())) {
+        if (preLoginEvent.isCancelled()) {
             return;
         }
 
@@ -212,16 +199,4 @@ public class ConnectListener implements Listener {
         plugin.getSession().remove(player.getPendingConnection());
         plugin.getCore().getPendingConfirms().remove(player.getUniqueId());
     }
-
-    private boolean isBedrockPlayer(UUID correctedUUID) {
-        // Floodgate will set a correct UUID at the beginning of the PreLoginEvent
-        // and will cancel the online mode login for those players
-        // Therefore we just ignore those
-        if (floodgateHook == null || correctedUUID == null) {
-            // Also ignore if not set by floodgate or any other plugin
-            return false;
-        }
-
-        return this.floodgateHook.isBedrockPlayer(correctedUUID);
-    }
 }