From 6316a50dbd7ccfa2724c95938104b85e99bae17f Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 11 Jan 2025 00:13:45 -0800 Subject: [PATCH] Make CraftServer#isPrimaryThread use TickThread check This diff was accidentally dropped when updating to hard fork. This diff importantly: - Does not return true if the async catcher is disabled - Does not return true during shutdown - Returns true for any instance of TickThread (enables watchdog and Folia threads to be considered main) --- .../src/main/java/org/bukkit/craftbukkit/CraftServer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java index 381448d8e..fda9daa63 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2550,7 +2550,7 @@ public final class CraftServer implements Server { @Override public boolean isPrimaryThread() { - return Thread.currentThread().equals(this.console.serverThread) || this.console.hasStopped() || !org.spigotmc.AsyncCatcher.enabled; // All bets are off if we have shut down (e.g. due to watchdog) + return ca.spottedleaf.moonrise.common.util.TickThread.isTickThread(); // Paper - rewrite chunk system } // Paper start - Adventure