From 9fa9b430f661036f17351d957c99d0f269b47e24 Mon Sep 17 00:00:00 2001
From: Acuadragon100 <8165958-acuadragon100@users.noreply.gitlab.com>
Date: Thu, 14 May 2026 11:56:42 +0200
Subject: [PATCH] Only tick levels the player is in on the client.

---
 .../seibel/distanthorizons/core/level/DhClientLevel.java    | 1 +
 .../distanthorizons/core/level/DhClientServerLevel.java     | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/com/seibel/distanthorizons/core/level/DhClientLevel.java b/core/src/main/java/com/seibel/distanthorizons/core/level/DhClientLevel.java
index 671a7dc29..0db4c0407 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/level/DhClientLevel.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/level/DhClientLevel.java
@@ -221,6 +221,7 @@ public class DhClientLevel extends AbstractDhLevel implements IDhClientLevel
 	{
 		try
 		{
+			if (MC_CLIENT.getWrappedClientLevel() == null || MC_CLIENT.getWrappedClientLevel().getDhLevel() != this) return;
 			this.clientside.clientTick();
 			
 			if (this.syncOnLoadRequestQueue != null)
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/level/DhClientServerLevel.java b/core/src/main/java/com/seibel/distanthorizons/core/level/DhClientServerLevel.java
index 5dfb921ea..a37933be2 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/level/DhClientServerLevel.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/level/DhClientServerLevel.java
@@ -71,7 +71,11 @@ public class DhClientServerLevel extends AbstractDhServerLevel implements IDhCli
 	//region
 	
 	@Override
-	public void clientTick() { this.clientside.clientTick(); }
+	public void clientTick()
+	{
+		if (MC_CLIENT.getWrappedClientLevel() == null || MC_CLIENT.getWrappedClientLevel().getDhLevel() != this) return;
+		this.clientside.clientTick();
+	}
 	
 	//endregion