From 36846aa6f1ed6e24e6d3353e47c5effa1ca6f8eb Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Mon, 13 May 2019 21:10:59 -0700 Subject: [PATCH] Fix CraftServer#isPrimaryThread and MinecraftServer isMainThread md_5 changed it so he could shut down the server asynchronously from watchdog, although we have patches that prevent that type of behavior for this exact reason. md_5 also placed code in PlayerConnectionUtils that would have solved https://bugs.mojang.com/browse/MC-142590, making the change to MinecraftServer#isMainThread irrelevant. By reverting his change to MinecraftServer#isMainThread packet handling that should have been handled synchronously will be handled synchronously when the server gets shut down. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java index 430d38b9c9..be31fef799 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -2199,7 +2199,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant