mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-09 06:50:32 +08:00
654b792caf
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes:a339310c#755: Fix NPE when calling getInventory() for virtual EnderChests2577f9bfIncrease outdated build delay1dabfdc8#754: Fix pre-1.16 serialized SkullMeta being broken on 1.16+, losing textures
26 lines
1.2 KiB
Diff
26 lines
1.2 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/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
|
|
index 54ef6eeb8866915f03fb16413c8b5f36a7501f82..fa72eae6befb9d05244b65bcaaed35e9fb492027 100644
|
|
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
|
|
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
|
|
@@ -355,11 +355,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
|