From 9d27ae8627adb4a9ea6f9cb0e9c6a4969099d7ba Mon Sep 17 00:00:00 2001
From: IzzelAliz <csh2001331@126.com>
Date: Sat, 28 Nov 2020 23:30:47 +0800
Subject: [PATCH] Fix worldgen async catcher deadlock

---
 .../common/bridge/server/MinecraftServerBridge.java   |  2 ++
 .../mixin/core/server/MinecraftServerMixin.java       | 11 +++++++----
 .../ServerChunkProvider_ChunkExecutorMixin.java       |  3 +++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/server/MinecraftServerBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/server/MinecraftServerBridge.java
index 88e878ce..25424d9d 100644
--- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/server/MinecraftServerBridge.java
+++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/server/MinecraftServerBridge.java
@@ -18,5 +18,7 @@ public interface MinecraftServerBridge {
 
     void bridge$queuedProcess(Runnable runnable);
 
+    void bridge$drainQueuedTasks();
+
     boolean bridge$hasStopped();
 }
diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/MinecraftServerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/MinecraftServerMixin.java
index a4e6a9e9..dfa0dd3d 100644
--- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/MinecraftServerMixin.java
+++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/MinecraftServerMixin.java
@@ -296,10 +296,15 @@ public abstract class MinecraftServerMixin extends RecursiveEventLoop<TickDelaye
 
     private void executeModerately() {
         this.drainTasks();
+        this.bridge$drainQueuedTasks();
+        java.util.concurrent.locks.LockSupport.parkNanos("executing tasks", 1000L);
+    }
+
+    @Override
+    public void bridge$drainQueuedTasks() {
         while (!processQueue.isEmpty()) {
             processQueue.remove().run();
         }
-        java.util.concurrent.locks.LockSupport.parkNanos("executing tasks", 1000L);
     }
 
     @Inject(method = "isAheadOfTime", cancellable = true, at = @At("HEAD"))
@@ -445,9 +450,7 @@ public abstract class MinecraftServerMixin extends RecursiveEventLoop<TickDelaye
     public void arclight$runScheduler(BooleanSupplier hasTimeLeft, CallbackInfo ci) {
         ArclightConstants.currentTick = (int) (System.currentTimeMillis() / 50);
         this.server.getScheduler().mainThreadHeartbeat(this.tickCounter);
-        while (!processQueue.isEmpty()) {
-            processQueue.remove().run();
-        }
+        this.bridge$drainQueuedTasks();
     }
 
     /**
diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/server/ServerChunkProvider_ChunkExecutorMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/server/ServerChunkProvider_ChunkExecutorMixin.java
index 9c0f730d..7cb6235f 100644
--- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/server/ServerChunkProvider_ChunkExecutorMixin.java
+++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/server/ServerChunkProvider_ChunkExecutorMixin.java
@@ -1,7 +1,9 @@
 package io.izzel.arclight.common.mixin.core.world.server;
 
+import io.izzel.arclight.common.bridge.server.MinecraftServerBridge;
 import io.izzel.arclight.common.bridge.world.server.ChunkManagerBridge;
 import io.izzel.arclight.common.bridge.world.server.ServerChunkProviderBridge;
+import io.izzel.arclight.common.mod.server.ArclightServer;
 import net.minecraft.util.concurrent.ThreadTaskExecutor;
 import net.minecraft.world.server.ServerChunkProvider;
 import org.spongepowered.asm.mixin.Final;
@@ -35,6 +37,7 @@ public abstract class ServerChunkProvider_ChunkExecutorMixin extends ThreadTaskE
             }
         } finally {
             ((ChunkManagerBridge) outer.chunkManager).bridge$getCallbackExecutor().run();
+            ((MinecraftServerBridge) ArclightServer.getMinecraftServer()).bridge$drainQueuedTasks();
         }
     }
 }