Fix idle tick time counting as scheduled tasks in F3 graph

embeddedt · embeddedt · commit 07592fb7089b · 2025-08-16T11:32:15.000-04:00
Related: #595
diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/fix_loop_spin_waiting/MinecraftServerMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/fix_loop_spin_waiting/MinecraftServerMixin.java
@@ -37,12 +37,12 @@ private void managedBlock(MinecraftServer instance, BooleanSupplier isDone, Oper
         }
     }
 
-    @Override
-    public void waitForTasks() {
+    @WrapOperation(method = "waitForTasks", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/thread/ReentrantBlockableEventLoop;waitForTasks()V"))
+    private void waitLongerForTasks(MinecraftServer instance, Operation<Void> original) {
         if (this.mfix$isWaitingForNextTick) {
             LockSupport.parkNanos("waiting for tasks", this.nextTickTimeNanos - Util.getNanos());
         } else {
-            super.waitForTasks();
+            original.call(instance);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -37,12 +37,12 @@ private void managedBlock(MinecraftServer instance, BooleanSupplier isDone, Oper`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
`40`		`- @Override`
`41`		`- public void waitForTasks() {`
	`40`	`+ @WrapOperation(method = "waitForTasks", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/thread/ReentrantBlockableEventLoop;waitForTasks()V"))`
	`41`	`+ private void waitLongerForTasks(MinecraftServer instance, Operation<Void> original) {`
`42`	`42`	`if (this.mfix$isWaitingForNextTick) {`
`43`	`43`	`LockSupport.parkNanos("waiting for tasks", this.nextTickTimeNanos - Util.getNanos());`
`44`	`44`	`} else {`
`45`		`- super.waitForTasks();`
	`45`	`+ original.call(instance);`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`	`}`