2020-04-02 23:07:06 +02:00
|
|
|
From e7dcbbb87ef8c0eb23dbd1d3c537c05e36249c73 Mon Sep 17 00:00:00 2001
|
2020-03-31 09:52:57 +02:00
|
|
|
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
|
|
|
|
|