twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-07-26 09:42:06 -07:00
Code Issues Packages Projects Releases Wiki Activity

Remote Connections shouldn't hold up shutdown

Browse Source 
Bugs in the connection logic appears to leave stale connections even, preventing shutdown
This commit is contained in:
Aikar
2020-03-31 03:50:42 -04:00
parent 1273cf0f21
commit a44dc35353
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
paper-server/patches/sources/net/minecraft/server/dedicated/DedicatedServer.java.patch
View File

@@ -250,8 +250,17 @@
@Override @Override
public boolean isSpawningMonsters() { public boolean isSpawningMonsters() {
return this.settings.getProperties().spawnMonsters && super.isSpawningMonsters(); return this.settings.getProperties().spawnMonsters && super.isSpawningMonsters();
@@ -293,6 +403,7 @@ @@ -286,13 +396,14 @@
this.queryThreadGs4.stop(); }
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 + System.exit(0); // CraftBukkit

15
paper-server/patches/sources/net/minecraft/server/rcon/thread/RconThread.java.patch
View File

@@ -9,3 +9,18 @@
if (string.isEmpty()) { if (string.isEmpty()) {
string = "0.0.0.0"; string = "0.0.0.0";
} }
@@ -104,6 +104,14 @@
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: {}", socket);