diff --git a/patches/server/Improved-Watchdog-Support.patch b/patches/server/Improved-Watchdog-Support.patch index 7f7668815..76abe4409 100644 --- a/patches/server/Improved-Watchdog-Support.patch +++ b/patches/server/Improved-Watchdog-Support.patch @@ -108,15 +108,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + // Paper start - kill main thread, and kill it hard + shutdownThread = Thread.currentThread(); + org.spigotmc.WatchdogThread.doStop(); // Paper -+ if (!isSameThread()) { -+ MinecraftServer.LOGGER.info("Stopping main thread (Ignore any thread death message you see! - DO NOT REPORT THREAD DEATH TO PAPER)"); -+ while (this.getRunningThread().isAlive()) { -+ this.getRunningThread().stop(); -+ try { -+ Thread.sleep(1); -+ } catch (InterruptedException e) {} -+ } -+ } + // Paper end // CraftBukkit end if (this.metricsRecorder.isRecording()) {