26 lines
1.2 KiB
Diff
26 lines
1.2 KiB
Diff
|
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
|
||
|
|
index 4862a9519d4ba5f05b634a0335837bea9812edee..f8ddc0aa98874c7879a51e76d1a629cbdaf58812 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
||
|
|
@@ -397,11 +397,11 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
|
||
|
|
}
|
||
|
|
|
||
|
|
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
|