23w43a

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

@@ -7,6 +7,7 @@ import net.minecraft.core.RegistryAccess;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.ServerFunctionManager;
+import net.minecraft.server.ServerTickRateManager;
 import net.minecraft.server.TickTask;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.players.PlayerList;
@@ -40,12 +41,6 @@ public abstract class MinecraftServer_scarpetMixin extends ReentrantBlockableEve
 
     @Shadow protected abstract void tickServer(BooleanSupplier booleanSupplier_1);
 
-    @Shadow private long nextTickTime;
-
-    @Shadow private long lastOverloadWarning;
-
-    @Shadow public abstract boolean pollTask();
-
     @Shadow @Final protected LevelStorageSource.LevelStorageAccess storageSource;
 
     @Shadow @Final private Map<ResourceKey<Level>, ServerLevel> levels;
@@ -62,11 +57,18 @@ public abstract class MinecraftServer_scarpetMixin extends ReentrantBlockableEve
 
     @Shadow @Final private StructureTemplateManager structureTemplateManager;
 
+    @Shadow public abstract ServerTickRateManager tickRateManager();
+
+    @Shadow private long nextTickTimeNanos;
+
+    @Shadow private long lastOverloadWarningNanos;
+
     @Override
     public void forceTick(BooleanSupplier isAhead)
     {
-        nextTickTime = lastOverloadWarning = Util.getMillis();
+        nextTickTimeNanos = lastOverloadWarningNanos = Util.getNanos();
         tickServer(isAhead);
+        pollTask();
         while(pollTask()) {Thread.yield();}
     }
 
@@ -88,7 +90,7 @@ public abstract class MinecraftServer_scarpetMixin extends ReentrantBlockableEve
     ))
     public void tickTasks(BooleanSupplier booleanSupplier_1, CallbackInfo ci)
     {
-        if (!getTickRateManager().runsNormally())
+        if (!tickRateManager().runsNormally())
         {
             return;
         }