#3746, #3666: Fix potential race conditions when connecting to multip…

…le servers at the same time
SpigotMC · Oct 6, 2024 · 9813e46 · 9813e46 · andreasdc · Oct 9, 2024
1 parent 01a5f36
commit 9813e46
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 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
@@ -361,7 +361,10 @@ private void cutThrough(ServerConnection server)
             if ( user.getServer() != null )
             {
                 // Begin config mode
-                user.unsafe().sendPacket( new StartConfiguration() );
+                if ( user.getCh().getEncodeProtocol() != Protocol.CONFIGURATION )
+                {
+                    user.unsafe().sendPacket( new StartConfiguration() );
+                }
             } else
             {
                 LoginResult loginProfile = user.getPendingConnection().getLoginProfile();

diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -306,6 +306,11 @@ public void connect(final ServerConnectRequest request)
     {
         Preconditions.checkNotNull( request, "request" );
 
+        ch.getHandle().eventLoop().execute( () -> connect0( request ) );
+    }
+
+    private void connect0(final ServerConnectRequest request)
+    {
         final Callback<ServerConnectRequest.Result> callback = request.getCallback();
         ServerConnectEvent event = new ServerConnectEvent( this, request.getTarget(), request.getReason(), request );
         if ( bungee.getPluginManager().callEvent( event ).isCancelled() )
@@ -315,10 +320,6 @@ public void connect(final ServerConnectRequest request)
                 callback.done( ServerConnectRequest.Result.EVENT_CANCEL, null );
             }
 
-            if ( getServer() == null && !ch.isClosing() )
-            {
-                throw new IllegalStateException( "Cancelled ServerConnectEvent with no server or disconnect." );
-            }
             return;
         }