PaperMC/Spigot-Server-Patches/0452-Remote-Connections-shouldn-t-hold-up-shutdown.patch
Aikar 586ee2bb11
Remove patch for MC-111480, fixed in 1.14
We were now starting entities at ID 2
2020-04-11 20:39:21 -04:00

28 lines
1.1 KiB
Diff

From 40d7404c77c19e8716c0f775cec4e0a62def396a 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/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index 349a0ea213..1ef7890da5 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -415,11 +415,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
}
if (this.remoteControlListener != null) {
- this.remoteControlListener.b();
+ //this.remoteControlListener.b(); // Paper - don't wait for remote connections
}
if (this.remoteStatusListener != null) {
- this.remoteStatusListener.b();
+ //this.remoteStatusListener.b(); // Paper - don't wait for remote connections
}
System.exit(0); // CraftBukkit
--
2.25.1