#3612: Error when disconnecting player on PostLoginEvent

SpigotMC · Feb 4, 2024 · 3e10075 · Janmm14 · Feb 4, 2024 · 3e10075
1 parent b52b146
commit 3e10075
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -10,6 +10,7 @@
 import java.util.Queue;
 import java.util.Set;
 import java.util.UUID;
+import java.util.logging.Level;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import net.md_5.bungee.api.ChatColor;
@@ -339,6 +340,14 @@ public static void handleLogin(ProxyServer bungee, ChannelWrapper ch, UserConnec
 
     private void cutThrough(ServerConnection server)
     {
+        // TODO: Fix this?
+        if ( !user.isActive() )
+        {
+            server.disconnect( "Quitting" );
+            bungee.getLogger().log( Level.WARNING, "[{0}] No client connected for pending server!", user );
+            return;
+        }
+
         if ( user.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_20_2 )
         {
             if ( user.getServer() != null )
@@ -360,15 +369,6 @@ private void cutThrough(ServerConnection server)
             user.getServer().disconnect( "Quitting" );
         }
 
-        // TODO: Fix this?
-        if ( !user.isActive() )
-        {
-            server.disconnect( "Quitting" );
-            // Silly server admins see stack trace and die
-            bungee.getLogger().warning( "No client connected for pending server!" );
-            return;
-        }
-
         // Add to new server
         // TODO: Move this to the connected() method of DownstreamBridge
         target.addPlayer( user );

diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -653,6 +653,13 @@ private void finish2()
 
         ch.getHandle().pipeline().get( HandlerBoss.class ).setHandler( new UpstreamBridge( bungee, userCon ) );
         bungee.getPluginManager().callEvent( new PostLoginEvent( userCon ) );
+
+        // #3612: Don't progress further if disconnected during event
+        if ( ch.isClosed() )
+        {
+            return;
+        }
+
         ServerInfo server;
         if ( bungee.getReconnectHandler() != null )
         {