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)
This commit is contained in:
@ -2550,7 +2550,7 @@ public final class CraftServer implements Server {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isPrimaryThread() {
|
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
|
// Paper start - Adventure
|
||||||
|
|||||||
Reference in New Issue
Block a user