Core/Maps: Ensure all child terrain maps are created before doing anything on parent map such as loading respawn times and corpses

1 files changed, 6 insertions, 4 deletions

diff --git a/src/server/game/Maps/MapManager.cpp b/src/server/game/Maps/MapManager.cpp
index fd9aae38386..431c56f36f3 100644
--- a/src/server/game/Maps/MapManager.cpp
+++ b/src/server/game/Maps/MapManager.cpp
@@ -102,17 +102,19 @@ Map* MapManager::CreateBaseMap_i(MapEntry const* mapEntry)
     if (mapEntry->Instanceable())
         map = new MapInstanced(mapEntry->ID, i_gridCleanUpDelay);
     else
-    {
         map = new Map(mapEntry->ID, i_gridCleanUpDelay, 0, DIFFICULTY_NONE);
-        map->LoadRespawnTimes();
-        map->LoadCorpseData();
-    }
 
     i_maps[mapEntry->ID] = map;
 
     for (uint32 childMapId : _parentMapData[mapEntry->ID])
         map->AddChildTerrainMap(CreateBaseMap_i(sMapStore.AssertEntry(childMapId)));
 
+    if (!mapEntry->Instanceable())
+    {
+        map->LoadRespawnTimes();
+        map->LoadCorpseData();
+    }
+
     return map;
 }