From 1680eeb80da785338a2d27e4c432610be5e102f2 Mon Sep 17 00:00:00 2001
From: ZacSharp <68165024+ZacSharp@users.noreply.github.com>
Date: Tue, 10 Jan 2023 17:25:32 +0100
Subject: [PATCH] Handle mods breaking our world loading hook

---
 .../java/baritone/cache/WorldProvider.java     | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/main/java/baritone/cache/WorldProvider.java b/src/main/java/baritone/cache/WorldProvider.java
index a7756137c..03ada444f 100644
--- a/src/main/java/baritone/cache/WorldProvider.java
+++ b/src/main/java/baritone/cache/WorldProvider.java
@@ -24,6 +24,7 @@ import baritone.utils.accessor.IAnvilChunkLoader;
 import baritone.utils.accessor.IChunkProviderServer;
 import net.minecraft.server.integrated.IntegratedServer;
 import net.minecraft.world.WorldServer;
+import net.minecraft.world.World;
 import org.apache.commons.lang3.SystemUtils;
 
 import java.io.File;
@@ -44,9 +45,11 @@ public class WorldProvider implements IWorldProvider, Helper {
     private static final Map<Path, WorldData> worldCache = new HashMap<>(); // this is how the bots have the same cached world
 
     private WorldData currentWorld;
+    private World mcWorld; // this let's us detect a broken load/unload hook
 
     @Override
     public final WorldData getCurrentWorld() {
+        detectAndHandleBrokenLoading();
         return this.currentWorld;
     }
 
@@ -83,6 +86,7 @@ public class WorldProvider implements IWorldProvider, Helper {
             } else {
                 //replaymod causes null currentServerData and false singleplayer.
                 currentWorld = null;
+                mcWorld = mc.world;
                 return;
             }
             if (SystemUtils.IS_OS_WINDOWS) {
@@ -110,11 +114,13 @@ public class WorldProvider implements IWorldProvider, Helper {
         synchronized (worldCache) {
             this.currentWorld = worldCache.computeIfAbsent(dir, d -> new WorldData(d, dimension));
         }
+        this.mcWorld = mc.world;
     }
 
     public final void closeWorld() {
         WorldData world = this.currentWorld;
         this.currentWorld = null;
+        this.mcWorld = null;
         if (world == null) {
             return;
         }
@@ -122,8 +128,20 @@ public class WorldProvider implements IWorldProvider, Helper {
     }
 
     public final void ifWorldLoaded(Consumer<WorldData> currentWorldConsumer) {
+        detectAndHandleBrokenLoading();
         if (this.currentWorld != null) {
             currentWorldConsumer.accept(this.currentWorld);
         }
     }
+
+    private final void detectAndHandleBrokenLoading() {
+        if (this.mcWorld != mc.world) {
+            if (this.currentWorld != null) {
+                closeWorld();
+            }
+            if (mc.world != null) {
+                initWorld(mc.world.provider.getDimensionType().getId());
+            }
+        }
+    }
 }