Remote Connections shouldn't hold up shutdown

Bugs in the connection logic appears to leave stale connections even, preventing shutdown
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/rcon/thread/RconThread.java.patch
+++ b/paper-server/patches/sources/net/minecraft/server/rcon/thread/RconThread.java.patch
@ -9,3 +9,18 @@
         if (string.isEmpty()) {
             string = "0.0.0.0";
         }
+@@ -104,6 +104,14 @@
+ 
+         this.clients.clear();
+     }
+    // Paper start - don't wait for remote connections
+    public void stopNonBlocking() {
+        this.running = false;
+        for (RconClient client : this.clients) {
+            client.running = false;
+        }
+    }
+    // Paper end - don't wait for remote connections
+ 
+     private void closeSocket(ServerSocket socket) {
+         LOGGER.debug("closeSocket: {}", socket);