From 4f615b0842fe103ccb901c4a5b4f9054a0cb686c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 31 Mar 2020 03:52:57 -0400
Subject: [PATCH] Remote Connections shouldn't hold up shutdown
Bugs in the connection logic appears to leave stale connections even, preventing shutdown
---
...nnections-shouldn-t-hold-up-shutdown.patch | 26 +++++++++++++++++++
1 file changed, 26 insertions(+)
create mode 100644 Spigot-Server-Patches/Remote-Connections-shouldn-t-hold-up-shutdown.patch
diff --git a/Spigot-Server-Patches/Remote-Connections-shouldn-t-hold-up-shutdown.patch b/Spigot-Server-Patches/Remote-Connections-shouldn-t-hold-up-shutdown.patch
new file mode 100644
index 0000000000..d6d21d91df
--- /dev/null
+++ b/Spigot-Server-Patches/Remote-Connections-shouldn-t-hold-up-shutdown.patch
@@ -0,0 +1,26 @@
+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/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
+@@ -0,0 +0,0 @@ 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
+--
\ No newline at end of file