Remote Connections shouldn't hold up shutdown

Bugs in the connection logic appears to leave stale connections even, preventing shutdown
2025-07-26 01:32:02 -07:00 · 2020-03-31 03:50:42 -04:00
parent 1273cf0f21
commit a44dc35353
2 changed files with 26 additions and 2 deletions
--- a/paper-server/patches/sources/net/minecraft/server/dedicated/DedicatedServer.java.patch
+++ b/paper-server/patches/sources/net/minecraft/server/dedicated/DedicatedServer.java.patch
@@ -250,8 +250,17 @@
     @Override
     public boolean isSpawningMonsters() {
         return this.settings.getProperties().spawnMonsters && super.isSpawningMonsters();
-@@ -293,6 +403,7 @@
-             this.queryThreadGs4.stop();
+@@ -286,13 +396,14 @@
+         }
+ 
+         if (this.rconThread != null) {
+-            this.rconThread.stop();
+            this.rconThread.stopNonBlocking(); // Paper - don't wait for remote connections
+         }
+ 
+         if (this.queryThreadGs4 != null) {
+-            this.queryThreadGs4.stop();
+            // this.remoteStatusListener.stop(); // Paper - don't wait for remote connections
         }
 
 +        System.exit(0); // CraftBukkit