mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-11 09:23:42 +01:00
57dd397155
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 Bukkit Changes: b999860d SPIGOT-2304: Add LootGenerateEvent CraftBukkit Changes:77fd87e4SPIGOT-2304: Implement LootGenerateEventa1a705eeSPIGOT-5566: Doused campfires & fires should call EntityChangeBlockEvent41712eddSPIGOT-5707: PersistentDataHolder not Persistent on API dropped Item
28 lines
1.1 KiB
Diff
28 lines
1.1 KiB
Diff
From 23ff45ad57869e36aa344f11b7c7f5ad6b028289 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 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.26.2
|
|
|