From f3d2f9c5c0573560f649112e75d43f985df1552b Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Sun, 5 May 2019 09:25:51 +1000 Subject: [PATCH] SPIGOT-4868: Server deadlock on /stop command By: md_5 --- paper-server/nms-patches/PlayerConnectionUtils.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/paper-server/nms-patches/PlayerConnectionUtils.patch b/paper-server/nms-patches/PlayerConnectionUtils.patch index 3fe05f31aa..a189c43803 100644 --- a/paper-server/nms-patches/PlayerConnectionUtils.patch +++ b/paper-server/nms-patches/PlayerConnectionUtils.patch @@ -4,7 +4,7 @@ public static void ensureMainThread(Packet packet, T t0, IAsyncTaskHandler iasynctaskhandler) throws CancelledPacketHandleException { if (!iasynctaskhandler.isMainThread()) { iasynctaskhandler.execute(() -> { -+ if (MinecraftServer.getServer().isStopped() || (t0 instanceof PlayerConnection && ((PlayerConnection) t0).processedDisconnect)) return; // CraftBukkit, MC-142590 ++ if (MinecraftServer.getServer().hasStopped() || (t0 instanceof PlayerConnection && ((PlayerConnection) t0).processedDisconnect)) return; // CraftBukkit, MC-142590 packet.a(t0); }); throw CancelledPacketHandleException.INSTANCE;