#3743: Fix infinite encrypting screen on miss configured ip-forwarding

SpigotMC · Oct 6, 2024 · 2bacf65 · 2bacf65 · andreasdc · Oct 7, 2024
1 parent 9813e46
commit 2bacf65
Showing 1 changed file with 9 additions and 0 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
@@ -137,6 +137,15 @@ public void connected(ChannelWrapper channel) throws Exception
     public void disconnected(ChannelWrapper channel) throws Exception
     {
         user.getPendingConnects().remove( target );
+
+        if ( !obsolete && user.getPendingConnects().isEmpty() && thisState == State.LOGIN_SUCCESS )
+        {
+            // this is called if we get disconnected but not have received any response after we send the handshake
+            // in this case probably an exception was thrown because the handshake could not be read correctly
+            // because of the extra ip forward data, also we skip the disconnect if another server is also in the
+            // pendingConnects queue because we don't want to lose the player
+            user.disconnect( "Unexpected disconnect during server login, did you forget to enable BungeeCord / IP forwarding on your server?" );
+        }
     }
 
     @Override