diff --git a/Spigot-Server-Patches/Forced-Watchdog-Crash-support-and-Improve-Async-Shut.patch b/Spigot-Server-Patches/Improved-Watchdog-Support.patch similarity index 95% rename from Spigot-Server-Patches/Forced-Watchdog-Crash-support-and-Improve-Async-Shut.patch rename to Spigot-Server-Patches/Improved-Watchdog-Support.patch index 278c6aa9e0..6a76c1ca7f 100644 --- a/Spigot-Server-Patches/Forced-Watchdog-Crash-support-and-Improve-Async-Shut.patch +++ b/Spigot-Server-Patches/Improved-Watchdog-Support.patch @@ -1,7 +1,9 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 12 Apr 2020 15:50:48 -0400 -Subject: [PATCH] Forced Watchdog Crash support and Improve Async Shutdown +Subject: [PATCH] Improved Watchdog Support + +Forced Watchdog Crash support and Improve Async Shutdown If the request to shut down the server is received while we are in a watchdog hang, immediately treat it as a crash and begin the shutdown @@ -35,6 +37,9 @@ We have to ensure Thread Death propagates correctly though to stop main complete This is to ensure that if main isn't truely stuck, it's not manipulating state we are trying to save. +This also moves all plugins who register "delayed init" tasks to occur just before "Done" so they +are properly accounted for and wont trip watchdog on init. + diff --git a/src/main/java/net/minecraft/server/CrashReport.java b/src/main/java/net/minecraft/server/CrashReport.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/server/CrashReport.java @@ -93,6 +98,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 // CraftBukkit end // Spigot start public static final int TPS = 20; +@@ -0,0 +0,0 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant