From 809990f76674cf38cdb976212e66a30f3723e8f3 Mon Sep 17 00:00:00 2001
From: Acuadragon100 <8165958-acuadragon100@users.noreply.gitlab.com>
Date: Sun, 3 May 2026 17:35:36 +0200
Subject: [PATCH] Make sure stale wrappers are not stored in the client level
 map.

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

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 42569f0a3..937ed97a2 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
@@ -144,6 +144,7 @@ public class DhClientServerWorld extends AbstractDhServerWorld<DhClientServerLev
 				// but note that the server side still has the level loaded. So, we don't want to unload the level,
 				// we just want to stop rendering it.
 				this.dhLevelByLevelWrapper.remove(wrapper).stopRenderer(); // Ignore resource warning. The level obj is referenced elsewhere.
+				wrapper.onUnload(); // We still want to unload the wrapper though.
 			}
 			ApiEventInjector.INSTANCE.fireAllEvents(DhApiLevelUnloadEvent.class, new DhApiLevelUnloadEvent.EventParam(wrapper));
 		}
@@ -174,6 +175,13 @@ public class DhClientServerWorld extends AbstractDhServerWorld<DhClientServerLev
 					ApiEventInjector.INSTANCE.fireAllEvents(DhApiLevelUnloadEvent.class, new DhApiLevelUnloadEvent.EventParam(serverLevelWrapper));
 				}
 				
+				IClientLevelWrapper clientLevelWrapper = level.getClientLevelWrapper();
+				if (clientLevelWrapper != null)
+				{
+					clientLevelWrapper.onUnload();
+					ApiEventInjector.INSTANCE.fireAllEvents(DhApiLevelUnloadEvent.class, new DhApiLevelUnloadEvent.EventParam(clientLevelWrapper));
+				}
+				
 				// close levels asynchronously to speed up
 				// shutdown on servers with a lot of levels
 				CompletableFuture<Void> closeFuture = new CompletableFuture<>();