2021-06-11 14:02:28 +02:00
|
|
|
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
|
2024-01-16 19:27:39 +01:00
|
|
|
index 7bc90a4b0cbbb2251122038d374860ff02f5edee..5f4f993243f19f1e88b7f2bc5e40a6b2125fd819 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
2023-08-28 13:05:48 +02:00
|
|
|
@@ -390,11 +390,11 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (this.rconThread != null) {
|
|
|
|
- this.rconThread.stop();
|
2023-06-09 07:25:23 +02:00
|
|
|
+ this.rconThread.stopNonBlocking(); // Paper - don't wait for remote connections
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (this.queryThreadGs4 != null) {
|
|
|
|
- this.queryThreadGs4.stop();
|
2023-06-09 07:25:23 +02:00
|
|
|
+ // this.remoteStatusListener.stop(); // Paper - don't wait for remote connections
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
System.exit(0); // CraftBukkit
|
2023-06-09 07:25:23 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/rcon/thread/RconThread.java b/src/main/java/net/minecraft/server/rcon/thread/RconThread.java
|
2024-01-21 12:11:43 +01:00
|
|
|
index 3bf60f640aa9fa4cabd2b3e5d3931e8467b9df24..b939da2d6309c6d2b3d1ef089adf7cbf70865196 100644
|
2023-06-09 07:25:23 +02:00
|
|
|
--- 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();
|
|
|
|
}
|
2024-01-21 12:11:43 +01:00
|
|
|
+ // Paper start - don't wait for remote connections
|
2023-06-09 07:25:23 +02:00
|
|
|
+ public void stopNonBlocking() {
|
|
|
|
+ this.running = false;
|
|
|
|
+ for (RconClient client : this.clients) {
|
|
|
|
+ client.running = false;
|
|
|
|
+ }
|
|
|
|
+ }
|
2024-01-21 12:11:43 +01:00
|
|
|
+ // Paper stop - don't wait for remote connections
|
2023-06-09 07:25:23 +02:00
|
|
|
|
|
|
|
private void closeSocket(ServerSocket socket) {
|
|
|
|
LOGGER.debug("closeSocket: {}", (Object)socket);
|