From e2e4e76fd9cebd374926c9d9badea6cad125fde0 Mon Sep 17 00:00:00 2001
From: Smart123s <28480228+Smart123s@users.noreply.github.com>
Date: Mon, 22 Mar 2021 20:35:22 +0100
Subject: [PATCH] Moved getGeyserPlayer() to the only class it's used in

---
 .../listener/protocollib/NameCheckTask.java   | 24 +++++++++++++++++--
 .../bukkit/task/FloodgateAuthTask.java        | 20 ----------------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/NameCheckTask.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/NameCheckTask.java
index 4508501e..d8da3d3c 100644
--- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/NameCheckTask.java
+++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/NameCheckTask.java
@@ -5,7 +5,6 @@ import com.comphenix.protocol.events.PacketEvent;
 import com.github.games647.fastlogin.bukkit.BukkitLoginSession;
 import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
 import com.github.games647.fastlogin.bukkit.event.BukkitFastLoginPreLoginEvent;
-import com.github.games647.fastlogin.bukkit.task.FloodgateAuthTask;
 import com.github.games647.fastlogin.core.StoredProfile;
 import com.github.games647.fastlogin.core.shared.JoinManagement;
 import com.github.games647.fastlogin.core.shared.event.FastLoginPreLoginEvent;
@@ -13,8 +12,12 @@ import com.github.games647.fastlogin.core.shared.event.FastLoginPreLoginEvent;
 import java.security.PublicKey;
 import java.util.Random;
 
+import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.geysermc.connector.GeyserConnector;
+import org.geysermc.connector.common.AuthType;
+import org.geysermc.connector.network.session.GeyserSession;
 
 public class NameCheckTask extends JoinManagement<Player, CommandSender, ProtocolLibLoginSource>
         implements Runnable {
@@ -45,7 +48,7 @@ public class NameCheckTask extends JoinManagement<Player, CommandSender, Protoco
         try {
             // check if the player is connecting through Geyser
             if (!plugin.getCore().getConfig().getString("allowFloodgateNameConflict").equalsIgnoreCase("false")
-                    && FloodgateAuthTask.getGeyserPlayer(username) != null) {
+                    && getGeyserPlayer(username) != null) {
                 plugin.getLog().info("Skipping name conflict checking for player {}", username);
                 return;
             }
@@ -93,4 +96,21 @@ public class NameCheckTask extends JoinManagement<Player, CommandSender, Protoco
         BukkitLoginSession loginSession = new BukkitLoginSession(username, profile);
         plugin.putSession(player.getAddress(), loginSession);
     }
+    
+    private static GeyserSession getGeyserPlayer(String username) {
+        if (Bukkit.getServer().getPluginManager().isPluginEnabled("floodgate-bukkit") &&
+                Bukkit.getServer().getPluginManager().isPluginEnabled("Geyser-Spigot") &&
+                GeyserConnector.getInstance().getDefaultAuthType() == AuthType.FLOODGATE) {
+            // the Floodgate API requires UUID, which is inaccessible at NameCheckTask.java
+            // the Floodgate API has a return value for Java (non-bedrock) players, if they
+            // are linked to a Bedrock account
+            // workaround: iterate over Geyser's player's usernames
+            for (GeyserSession geyserPlayer : GeyserConnector.getInstance().getPlayers()) {
+                if (geyserPlayer.getName().equals(username)) {
+                    return geyserPlayer;
+                }
+            }
+        }
+        return null;
+    }
 }
diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/task/FloodgateAuthTask.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/task/FloodgateAuthTask.java
index c20d2ada..b056b1f8 100644
--- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/task/FloodgateAuthTask.java
+++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/task/FloodgateAuthTask.java
@@ -2,9 +2,6 @@ package com.github.games647.fastlogin.bukkit.task;
 
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.common.AuthType;
-import org.geysermc.connector.network.session.GeyserSession;
 import org.geysermc.floodgate.FloodgateAPI;
 import org.geysermc.floodgate.FloodgatePlayer;
 
@@ -86,21 +83,4 @@ public class FloodgateAuthTask implements Runnable {
         Bukkit.getScheduler().runTaskAsynchronously(plugin, forceLoginTask);
     }
 
-    public static GeyserSession getGeyserPlayer(String username) {
-        if (Bukkit.getServer().getPluginManager().isPluginEnabled("floodgate-bukkit") &&
-                Bukkit.getServer().getPluginManager().isPluginEnabled("Geyser-Spigot") &&
-                GeyserConnector.getInstance().getDefaultAuthType() == AuthType.FLOODGATE) {
-            // the Floodgate API requires UUID, which is inaccessible at NameCheckTask.java
-            // the Floodgate API has a return value for Java (non-bedrock) players, if they
-            // are linked to a Bedrock account
-            // workaround: iterate over Geyser's player's usernames
-            for (GeyserSession geyserPlayer : GeyserConnector.getInstance().getPlayers()) {
-                if (geyserPlayer.getName().equals(username)) {
-                    return geyserPlayer;
-                }
-            }
-        }
-        return null;
-    }
-
 }