2021-06-11 12:02:28 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Tue, 31 Mar 2020 03:50:42 -0400
|
|
|
|
Subject: [PATCH] Remote Connections shouldn't hold up shutdown
|
|
|
|
|
|
|
|
Bugs in the connection logic appears to leave stale connections even, preventing shutdown
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
2021-07-07 06:52:40 +00:00
|
|
|
index 047ec5fe63789fb0ac003ecee641542f5e9cba2f..b6ccc8cacb615a35a60c73f145b7bd1cf0b891ee 100644
|
2021-06-11 12:02:28 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
2021-07-07 06:52:40 +00:00
|
|
|
@@ -441,11 +441,11 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
|
2021-06-11 12:02:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (this.rconThread != null) {
|
|
|
|
- this.rconThread.stop();
|
|
|
|
+ //this.remoteControlListener.b(); // Paper - don't wait for remote connections
|
|
|
|
}
|
|
|
|
|
|
|
|
if (this.queryThreadGs4 != null) {
|
|
|
|
- this.queryThreadGs4.stop();
|
|
|
|
+ //this.remoteStatusListener.b(); // Paper - don't wait for remote connections
|
|
|
|
}
|
|
|
|
|
|
|
|
System.exit(0); // CraftBukkit
|