From 03abdfdc498965bb387588162a2c7de7555f74a2 Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Tue, 9 May 2023 16:52:10 -0400
Subject: [PATCH] Optimize server thread aliveness check

---
 .../mixin/bugfix/chunk_deadlock/ServerChunkCacheMixin.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/chunk_deadlock/ServerChunkCacheMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/chunk_deadlock/ServerChunkCacheMixin.java
index 682577bd..baf84759 100644
--- a/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/chunk_deadlock/ServerChunkCacheMixin.java
+++ b/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/chunk_deadlock/ServerChunkCacheMixin.java
@@ -29,7 +29,7 @@ public abstract class ServerChunkCacheMixin {
 
     @Inject(method = "getChunk", at = @At("HEAD"), cancellable = true)
     private void bailIfServerDead(int chunkX, int chunkZ, ChunkStatus requiredStatus, boolean load, CallbackInfoReturnable<ChunkAccess> cir) {
-        if(!this.mainThread.isAlive()) {
+        if(!this.level.getServer().isRunning() && !this.mainThread.isAlive()) {
             ModernFix.LOGGER.fatal("A mod is accessing chunks from a stopped server (this will also cause memory leaks)");
             if(debugDeadServerAccess) {
                 new Exception().printStackTrace();