From 18dc488ab9220fd8fef88026966e8a38d27e0f12 Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Thu, 19 Mar 2026 20:36:07 -0400
Subject: [PATCH] Avoid spinning in Minecraft.doWorldLoad

---
 .../MinecraftMixin.java                       | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 src/main/java/org/embeddedt/modernfix/common/mixin/perf/suspend_integrated_server_during_load/MinecraftMixin.java

diff --git a/src/main/java/org/embeddedt/modernfix/common/mixin/perf/suspend_integrated_server_during_load/MinecraftMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/suspend_integrated_server_during_load/MinecraftMixin.java
new file mode 100644
index 00000000..3d044b92
--- /dev/null
+++ b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/suspend_integrated_server_during_load/MinecraftMixin.java
@@ -0,0 +1,24 @@
+package org.embeddedt.modernfix.common.mixin.perf.suspend_integrated_server_during_load;
+
+import net.minecraft.client.Minecraft;
+import org.embeddedt.modernfix.annotation.ClientOnlyMixin;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Mixin(Minecraft.class)
+@ClientOnlyMixin
+public class MinecraftMixin {
+    /**
+     * @author embeddedt
+     * @reason spin-waiting burns CPU time on the main thread, when the server thread is likely to take some time
+     * to be ready.
+     */
+    @Redirect(method = "doWorldLoad", at = @At(value = "INVOKE", target = "Ljava/lang/Thread;yield()V"))
+    private void sleepInsteadOfYield() {
+        try {
+            Thread.sleep(16L);
+        } catch (InterruptedException ignored) {
+        }
+    }
+}