From 1908a0ccbfff58208eb7abd945f3db950e9f97c5 Mon Sep 17 00:00:00 2001
From: Acuadragon100 <8165958-acuadragon100@users.noreply.gitlab.com>
Date: Fri, 15 May 2026 15:14:52 +0200
Subject: [PATCH] Fix null pointer exception when server level was unloaded
 before the client level.

---
 .../distanthorizons/core/world/DhClientServerWorld.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/com/seibel/distanthorizons/core/world/DhClientServerWorld.java b/core/src/main/java/com/seibel/distanthorizons/core/world/DhClientServerWorld.java
index e943e8772..6e61e0fb2 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/world/DhClientServerWorld.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/world/DhClientServerWorld.java
@@ -146,8 +146,8 @@ public class DhClientServerWorld extends AbstractDhServerWorld<DhClientServerLev
 				// we just want to stop rendering it.
 				DhClientServerLevel level = this.dhLevelByLevelWrapper.remove(wrapper); // Ignore resource warning. The level obj is referenced elsewhere.
 				Set<ILevelWrapper> wrappers = dhLevels.get(level);
-				wrappers.remove(wrapper);
-				if (wrappers.isEmpty()) {
+				if (wrappers != null) wrappers.remove(wrapper);
+				if ((wrappers == null || wrappers.isEmpty()) && level.isRendering()) {
 					level.stopRenderer();
 				}
 				wrapper.onUnload(); // We still want to unload the wrapper though.