mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-04 18:01:17 +01:00
45 lines
2.0 KiB
Diff
45 lines
2.0 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 47b12535d2cb146155044cc20b14bb5a432f83d5..567e642232cc698995def33d7cbe1f679ea7a871 100644
|
|
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
|
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
|
@@ -390,11 +390,11 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
|
|
}
|
|
|
|
if (this.rconThread != null) {
|
|
- this.rconThread.stop();
|
|
+ this.rconThread.stopNonBlocking(); // Paper - don't wait for remote connections
|
|
}
|
|
|
|
if (this.queryThreadGs4 != null) {
|
|
- this.queryThreadGs4.stop();
|
|
+ // this.remoteStatusListener.stop(); // Paper - don't wait for remote connections
|
|
}
|
|
|
|
System.exit(0); // CraftBukkit
|
|
diff --git a/src/main/java/net/minecraft/server/rcon/thread/RconThread.java b/src/main/java/net/minecraft/server/rcon/thread/RconThread.java
|
|
index 3bf60f640aa9fa4cabd2b3e5d3931e8467b9df24..8a493fa049dec741294098e3fee540a60f2accab 100644
|
|
--- a/src/main/java/net/minecraft/server/rcon/thread/RconThread.java
|
|
+++ b/src/main/java/net/minecraft/server/rcon/thread/RconThread.java
|
|
@@ -107,6 +107,14 @@ public class RconThread extends GenericThread {
|
|
|
|
this.clients.clear();
|
|
}
|
|
+ // Paper start - don't wait for remote connections
|
|
+ public void stopNonBlocking() {
|
|
+ this.running = false;
|
|
+ for (RconClient client : this.clients) {
|
|
+ client.running = false;
|
|
+ }
|
|
+ }
|
|
+ // Paper end - don't wait for remote connections
|
|
|
|
private void closeSocket(ServerSocket socket) {
|
|
LOGGER.debug("closeSocket: {}", (Object)socket);
|