#3695, #3696: Connect player to fallback if backend disconnects silently

SpigotMC · Jun 22, 2024 · cda4537 · cda4537
1 parent df413f6
commit cda4537
Showing 1 changed file with 17 additions and 5 deletions.
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -103,7 +103,7 @@ public void exception(Throwable t) throws Exception
         {
             server.setObsolete( true );
             con.connectNow( def, ServerConnectEvent.Reason.SERVER_DOWN_REDIRECT );
-            con.sendMessage( bungee.getTranslation( "server_went_down" ) );
+            con.sendMessage( bungee.getTranslation( "server_went_down", def.getName() ) );
         } else
         {
             con.disconnect( Util.exception( t ) );
@@ -120,13 +120,25 @@ public void disconnected(ChannelWrapper channel) throws Exception
             bungee.getReconnectHandler().setServer( con );
         }
 
-        if ( !server.isObsolete() )
+        ServerDisconnectEvent serverDisconnectEvent = new ServerDisconnectEvent( con, server.getInfo() );
+        bungee.getPluginManager().callEvent( serverDisconnectEvent );
+
+        if ( server.isObsolete() )
         {
-            con.disconnect( bungee.getTranslation( "lost_connection" ) );
+            // do not perform any actions if the user has already moved
+            return;
         }
 
-        ServerDisconnectEvent serverDisconnectEvent = new ServerDisconnectEvent( con, server.getInfo() );
-        bungee.getPluginManager().callEvent( serverDisconnectEvent );
+        ServerInfo def = con.updateAndGetNextServer( server.getInfo() );
+        if ( def != null )
+        {
+            server.setObsolete( true );
+            con.connectNow( def, ServerConnectEvent.Reason.SERVER_DOWN_REDIRECT );
+            con.sendMessage( bungee.getTranslation( "server_went_down", def.getName() ) );
+        } else
+        {
+            con.disconnect( bungee.getTranslation( "lost_connection" ) );
+        }
     }
 
     @Override