Merge branch 'master' into update-internals-to-upstream-latest

GTNewHorizons · May 26, 2024 · 0c0aa50 · 0c0aa50
2 parents 11a7081 + 7b3dc2b
commit 0c0aa50
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/main/java/org/dynmap/forge/integration/ForgeChunkLoaderMarkers.java b/src/main/java/org/dynmap/forge/integration/ForgeChunkLoaderMarkers.java
@@ -14,6 +14,7 @@
 import org.dynmap.DynmapCommonAPI;
 import org.dynmap.DynmapCommonAPIListener;
 import org.dynmap.DynmapCore;
+import org.dynmap.DynmapWorld;
 import org.dynmap.forge.ForgeWorld;
 import org.dynmap.forge.GwmCommand;
 import org.dynmap.forge.GwmConfig;
@@ -91,7 +92,8 @@ private void createMarkersForTicket(ForgeChunkManager.Ticket ticket) {
 
         String worldName = ForgeWorld.getWorldName(ticket.world);
 
-        if(!fullAPI.getWorld(worldName).isEnabled())
+        DynmapWorld world = fullAPI.getWorld(worldName);
+        if(world == null || !world.isEnabled())
             return;
 
         int minX = Integer.MAX_VALUE, minZ = Integer.MAX_VALUE, maxX = Integer.MIN_VALUE, maxZ = Integer.MIN_VALUE;