From a392d475c28c62f25992de49d5d137b098e4ad92 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Mon, 27 Jan 2025 16:25:02 -0800 Subject: [PATCH] Make Watchdog thread extend TickThread This allows the watchdog thread to be seen as the primary thread during shutdown, which prevents it from tripping thread checks in various areas. Fixes https://github.com/PaperMC/Paper/issues/12030 --- paper-server/src/main/java/org/spigotmc/WatchdogThread.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/paper-server/src/main/java/org/spigotmc/WatchdogThread.java b/paper-server/src/main/java/org/spigotmc/WatchdogThread.java index a9339f59f..dced8899b 100644 --- a/paper-server/src/main/java/org/spigotmc/WatchdogThread.java +++ b/paper-server/src/main/java/org/spigotmc/WatchdogThread.java @@ -11,7 +11,7 @@ import net.minecraft.server.MinecraftServer; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.CraftServer; -public class WatchdogThread extends Thread { +public class WatchdogThread extends ca.spottedleaf.moonrise.common.util.TickThread { // Paper - rewrite chunk system public static final boolean DISABLE_WATCHDOG = Boolean.getBoolean("disable.watchdog"); // Paper - Improved watchdog support private static WatchdogThread instance;