From 06e419750975f2de9ab090dbcb0b2282614cfc5e Mon Sep 17 00:00:00 2001
From: gnembon <gnembonmc@gmail.com>
Date: Thu, 16 May 2019 20:54:54 -0300
Subject: [PATCH] fixing lockup on forced tick

---
 .../carpet/mixins/MinecraftServer_scarpetMixin.java    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/java/carpet/mixins/MinecraftServer_scarpetMixin.java b/src/main/java/carpet/mixins/MinecraftServer_scarpetMixin.java
index ec137140..2540b068 100644
--- a/src/main/java/carpet/mixins/MinecraftServer_scarpetMixin.java
+++ b/src/main/java/carpet/mixins/MinecraftServer_scarpetMixin.java
@@ -2,6 +2,8 @@ package carpet.mixins;
 
 import carpet.fakes.MinecraftServerInterface;
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.ServerTask;
+import net.minecraft.util.NonBlockingThreadExecutor;
 import net.minecraft.util.SystemUtil;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -9,8 +11,13 @@ import org.spongepowered.asm.mixin.Shadow;
 import java.util.function.BooleanSupplier;
 
 @Mixin(MinecraftServer.class)
-public abstract class MinecraftServer_scarpetMixin implements MinecraftServerInterface
+public abstract class MinecraftServer_scarpetMixin extends NonBlockingThreadExecutor<ServerTask> implements MinecraftServerInterface
 {
+    public MinecraftServer_scarpetMixin(String string_1)
+    {
+        super(string_1);
+    }
+
     @Shadow protected abstract void tick(BooleanSupplier booleanSupplier_1);
 
     @Shadow private long timeReference;
@@ -22,5 +29,6 @@ public abstract class MinecraftServer_scarpetMixin implements MinecraftServerInt
     {
         timeReference = field_4557 = SystemUtil.getMeasuringTimeMs();
         tick(isAhead);
+        executeTaskQueue();
     }
 }