From 5a263956fe55ddd46fbcef1028a06fda92b6ff96 Mon Sep 17 00:00:00 2001 From: Smart123s <28480228+Smart123s@users.noreply.github.com> Date: Thu, 6 May 2021 11:56:24 +0200 Subject: [PATCH] Fixed Java auto login/register --- .../bukkit/listener/ConnectionListener.java | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/ConnectionListener.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/ConnectionListener.java index c1961af7..facf3469 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/ConnectionListener.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/ConnectionListener.java @@ -49,19 +49,25 @@ public class ConnectionListener implements Listener { // having the login session from the login process BukkitLoginSession session = plugin.getSession(player.getAddress()); + boolean isFloodgateLogin = false; if (Bukkit.getServer().getPluginManager().isPluginEnabled("floodgate")) { FloodgatePlayer floodgatePlayer = FloodgateApi.getInstance().getPlayer(player.getUniqueId()); if (floodgatePlayer != null) { + isFloodgateLogin = true; Runnable floodgateAuthTask = new FloodgateAuthTask(plugin, player, floodgatePlayer); Bukkit.getScheduler().runTaskAsynchronously(plugin, floodgateAuthTask); } - } else if (session == null) { - String sessionId = plugin.getSessionId(player.getAddress()); - plugin.getLog().info("No on-going login session for player: {} with ID {}", player, sessionId); - } else { - Runnable forceLoginTask = new ForceLoginTask(plugin.getCore(), player, session); - Bukkit.getScheduler().runTaskAsynchronously(plugin, forceLoginTask); - } + } + + if (!isFloodgateLogin) { + if (session == null) { + String sessionId = plugin.getSessionId(player.getAddress()); + plugin.getLog().info("No on-going login session for player: {} with ID {}", player, sessionId); + } else { + Runnable forceLoginTask = new ForceLoginTask(plugin.getCore(), player, session); + Bukkit.getScheduler().runTaskAsynchronously(plugin, forceLoginTask); + } + } plugin.getBungeeManager().markJoinEventFired(player); // delay the login process to let auth plugins initialize the player