diff --git a/fabric/src/main/java/com/seibel/lod/fabric/ClientProxy.java b/fabric/src/main/java/com/seibel/lod/fabric/ClientProxy.java index 3e36bf961..490ef9e4d 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/ClientProxy.java +++ b/fabric/src/main/java/com/seibel/lod/fabric/ClientProxy.java @@ -38,6 +38,7 @@ import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerWorldEvents; import net.minecraft.client.KeyMapping; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.screens.TitleScreen; import net.minecraft.core.BlockPos; import net.minecraft.server.MinecraftServer; import net.minecraft.world.level.Level; @@ -119,6 +120,7 @@ public class ClientProxy /** This is also called when a new dimension loads */ public void worldLoadEvent(Level level) { + if (Minecraft.getInstance().screen instanceof TitleScreen) return; if (level != null) { eventApi.worldLoadEvent(WorldWrapper.getWorldWrapper(level)); } diff --git a/forge/src/main/java/com/seibel/lod/forge/ForgeClientProxy.java b/forge/src/main/java/com/seibel/lod/forge/ForgeClientProxy.java index b48016f49..fb3036c29 100644 --- a/forge/src/main/java/com/seibel/lod/forge/ForgeClientProxy.java +++ b/forge/src/main/java/com/seibel/lod/forge/ForgeClientProxy.java @@ -23,6 +23,7 @@ import com.seibel.lod.core.api.ClientApi; import com.seibel.lod.core.api.EventApi; import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper; +import net.minecraft.client.gui.screens.TitleScreen; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.world.entity.player.Player; import org.lwjgl.glfw.GLFW; @@ -76,6 +77,7 @@ public class ForgeClientProxy @SubscribeEvent public void worldLoadEvent(WorldEvent.Load event) { + if (Minecraft.getInstance().screen instanceof TitleScreen) return; if (event.getWorld() != null) { eventApi.worldLoadEvent(WorldWrapper.getWorldWrapper(event.getWorld())); }