19w45a

src/main/java/carpet/mixins/MinecraftServer_scarpetMixin.java

@@ -4,8 +4,8 @@ import carpet.CarpetServer;
 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 net.minecraft.util.Util;
+import net.minecraft.util.thread.ReentrantThreadExecutor;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -19,7 +19,7 @@ import static carpet.script.CarpetEventServer.Event.NETHER_TICK;
 import static carpet.script.CarpetEventServer.Event.TICK;
 
 @Mixin(MinecraftServer.class)
-public abstract class MinecraftServer_scarpetMixin extends NonBlockingThreadExecutor<ServerTask> implements MinecraftServerInterface
+public abstract class MinecraftServer_scarpetMixin extends ReentrantThreadExecutor<ServerTask> implements MinecraftServerInterface
 {
     public MinecraftServer_scarpetMixin(String string_1)
     {
@@ -32,14 +32,14 @@ public abstract class MinecraftServer_scarpetMixin extends NonBlockingThreadExec
 
     @Shadow private long field_4557;
 
-    @Shadow public abstract boolean executeQueuedTask();
+    @Shadow public abstract boolean runTask();
 
     @Override
     public void forceTick(BooleanSupplier isAhead)
     {
-        timeReference = field_4557 = SystemUtil.getMeasuringTimeMs();
+        timeReference = field_4557 = Util.getMeasuringTimeMs();
         tick(isAhead);
-        executeQueuedTasks();
+        runTask();
     }
 
     @Inject(method = "tick", at = @At(