Merge 1.20 into 1.21

embeddedt · Jul 7, 2024 · d7bfeed · d7bfeed
2 parents 212f139 + fd42c5b
commit d7bfeed
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git 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 void run() {
             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);

diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/init/ModernFixForge.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/init/ModernFixForge.java
@@ -25,7 +25,6 @@
 import org.embeddedt.modernfix.ModernFix;
 import org.embeddedt.modernfix.core.ModernFixMixinPlugin;
 import org.embeddedt.modernfix.neoforge.ModernFixConfig;
-import org.embeddedt.modernfix.neoforge.classloading.ClassLoadHack;
 import org.embeddedt.modernfix.neoforge.classloading.ModFileScanDataDeduplicator;
 import org.embeddedt.modernfix.neoforge.config.NightConfigFixer;
 
@@ -47,7 +46,6 @@ public ModernFixForge(ModContainer modContainer, IEventBus modBus) {
         }
         modContainer.registerConfig(ModConfig.Type.COMMON, ModernFixConfig.COMMON_CONFIG);
         ModFileScanDataDeduplicator.deduplicate();
-        ClassLoadHack.loadModClasses();
         //ConfigFixer.replaceConfigHandlers();
     }