#3711, #3712: Don't try to reconnect player when it disconnects manually

* Set server obsolete when disconnected by the proxy
SpigotMC · Jul 28, 2024 · a57adcc · a57adcc
1 parent 8b195d1
commit a57adcc
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 2 deletions.
diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnection.java b/proxy/src/main/java/net/md_5/bungee/ServerConnection.java
@@ -81,6 +81,7 @@ public void disconnect(BaseComponent... reason)
     {
         Preconditions.checkArgument( reason.length == 0, "Server cannot have disconnect reason" );
 
+        isObsolete = true;
         ch.close();
     }
 

diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -373,7 +373,6 @@ private void cutThrough(ServerConnection server)
         // Remove from old servers
         if ( user.getServer() != null )
         {
-            user.getServer().setObsolete( true );
             user.getServer().disconnect( "Quitting" );
         }
 

diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -439,7 +439,6 @@ public void disconnect0(final BaseComponent reason)
 
             if ( server != null )
             {
-                server.setObsolete( true );
                 server.disconnect( "Quitting" );
             }
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -81,6 +81,7 @@ public void disconnect(BaseComponent... reason) @@
         {
             Preconditions.checkArgument( reason.length == 0, "Server cannot have disconnect reason" );
+            isObsolete = true;
             ch.close();
         }
@@ Expand Down @@