2021-06-11 14:02:28 +02: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
|
2022-09-26 10:02:51 +02:00
|
|
|
index b23905e5d2d1e8300c710df2aeb370fd4af8ac76..2a84d4b07b89672b76d31fa60bb4a0c1ba394831 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
2022-06-09 23:43:27 +02:00
|
|
|
@@ -397,11 +397,11 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
|
2021-06-11 14:02:28 +02: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
|