diff options
Diffstat (limited to 'patches/unapplied/server/0367-Remote-Connections-shouldn-t-hold-up-shutdown.patch')
| -rw-r--r-- | patches/unapplied/server/0367-Remote-Connections-shouldn-t-hold-up-shutdown.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/patches/unapplied/server/0367-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/unapplied/server/0367-Remote-Connections-shouldn-t-hold-up-shutdown.patch new file mode 100644 index 0000000000..d5876d02e0 --- /dev/null +++ b/patches/unapplied/server/0367-Remote-Connections-shouldn-t-hold-up-shutdown.patch @@ -0,0 +1,25 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Aikar <[email protected]> +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 338841804a92bea5ca074300eaea9374d1b77020..f22c50f0a2ef05e9f52550db7c40b5b99632650c 100644 +--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java ++++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +@@ -391,11 +391,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 |