From 3bad8f59348c14c80806aaa5726c104f695a5033 Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Sat, 29 Jun 2024 13:46:03 -0400
Subject: [PATCH 1/2] Avoid "timeout is negative" exception in watchdog

---
 .../java/org/embeddedt/modernfix/world/IntegratedWatchdog.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/src/main/java/org/embeddedt/modernfix/world/IntegratedWatchdog.java b/common/src/main/java/org/embeddedt/modernfix/world/IntegratedWatchdog.java
index 8632e02c..24305aa5 100644
--- a/common/src/main/java/org/embeddedt/modernfix/world/IntegratedWatchdog.java
+++ b/common/src/main/java/org/embeddedt/modernfix/world/IntegratedWatchdog.java
@@ -45,6 +45,7 @@ public class IntegratedWatchdog extends Thread {
             if(delta > MAX_TICK_DELTA) {
                 LOGGER.error("A single server tick has taken {}, more than {} milliseconds", delta, MAX_TICK_DELTA);
                 LOGGER.error(ThreadDumper.obtainThreadDump());
+                delta = 0;
             }
             try {
                 Thread.sleep(MAX_TICK_DELTA - delta);

From fd42c5b1296c39c13defafcb64e534da402ccb06 Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Sun, 7 Jul 2024 09:13:57 -0400
Subject: [PATCH 2/2] Disable classload hack as it causes the same issue it
 tried to solve

Related: #431
---
 .../java/org/embeddedt/modernfix/forge/init/ModernFixForge.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/init/ModernFixForge.java b/forge/src/main/java/org/embeddedt/modernfix/forge/init/ModernFixForge.java
index d732d0d9..d03b8e7d 100644
--- a/forge/src/main/java/org/embeddedt/modernfix/forge/init/ModernFixForge.java
+++ b/forge/src/main/java/org/embeddedt/modernfix/forge/init/ModernFixForge.java
@@ -28,7 +28,6 @@ import org.embeddedt.modernfix.ModernFix;
 import org.embeddedt.modernfix.core.ModernFixMixinPlugin;
 import org.embeddedt.modernfix.entity.EntityDataIDSyncHandler;
 import org.embeddedt.modernfix.forge.ModernFixConfig;
-import org.embeddedt.modernfix.forge.classloading.ClassLoadHack;
 import org.embeddedt.modernfix.forge.classloading.ModFileScanDataDeduplicator;
 import org.embeddedt.modernfix.forge.config.ConfigFixer;
 import org.embeddedt.modernfix.forge.config.NightConfigFixer;
@@ -53,7 +52,6 @@ public class ModernFixForge {
         ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, ModernFixConfig.COMMON_CONFIG);
         PacketHandler.register();
         ModFileScanDataDeduplicator.deduplicate();
-        ClassLoadHack.loadModClasses();
         ConfigFixer.replaceConfigHandlers();
     }