fix: log async catcher messages in case the offending mod swallows it

RelativityMC · Feb 12, 2024 · 3fcb0a0 · 3fcb0a0
1 parent 97eef75
commit 3fcb0a0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/...land/c2me/fixes/general/threading_issues/mixin/asynccatchers/MixinServerChunkManager.java b/...land/c2me/fixes/general/threading_issues/mixin/asynccatchers/MixinServerChunkManager.java
@@ -8,14 +8,20 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
+import java.util.ConcurrentModificationException;
+
 @Mixin(ServerChunkManager.class)
 public class MixinServerChunkManager {
 
     @Shadow @Final private Thread serverThread;
 
     @Inject(method = "tick(Ljava/util/function/BooleanSupplier;Z)V", at = @At("HEAD"))
     private void onTick(CallbackInfo ci) {
-        if (Thread.currentThread() != this.serverThread) throw new IllegalStateException("Async ticking server chunk manager");
+        if (Thread.currentThread() != this.serverThread) {
+            final ConcurrentModificationException e = new ConcurrentModificationException("Async ticking server chunk manager");
+            e.printStackTrace();
+            throw e;
+        }
     }
 
 }
diff --git a/...me/fixes/general/threading_issues/mixin/asynccatchers/MixinThreadedAnvilChunkStorage.java b/...me/fixes/general/threading_issues/mixin/asynccatchers/MixinThreadedAnvilChunkStorage.java
@@ -19,14 +19,18 @@ public class MixinThreadedAnvilChunkStorage {
     @Inject(method = "loadEntity", at = @At("HEAD"))
     private void preventAsyncEntityLoad(CallbackInfo ci) {
         if (!this.mainThreadExecutor.isOnThread()) {
-            throw new ConcurrentModificationException("Async entity load");
+            final ConcurrentModificationException e = new ConcurrentModificationException("Async entity load");
+            e.printStackTrace();
+            throw e;
         }
     }
 
     @Inject(method = "unloadEntity", at = @At("HEAD"))
     private void preventAsyncEntityUnload(CallbackInfo ci) {
         if (!this.mainThreadExecutor.isOnThread()) {
-            throw new ConcurrentModificationException("Async entity unload");
+            final ConcurrentModificationException e = new ConcurrentModificationException("Async entity unload");
+            e.printStackTrace();
+            throw e;
         }
     }