diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 11 | ||||
| -rw-r--r-- | src/server/game/World/World.cpp | 6 |
2 files changed, 11 insertions, 6 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 91e6d48130e..236f19c21f6 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -2906,9 +2906,14 @@ void ObjectMgr::LoadInstanceSpawnGroups() } uint16 const instanceMapId = fields[0].GetUInt16(); - std::vector<InstanceSpawnGroupInfo>& vector = _instanceSpawnGroupStore[instanceMapId]; - vector.emplace_back(); - InstanceSpawnGroupInfo& info = vector.back(); + if (it->second.mapId != instanceMapId) + { + TC_LOG_ERROR("sql.sql", "Instance spawn group %u specified for instance %u has spawns on a different map %u. Skipped.", + spawnGroupId, instanceMapId, it->second.mapId); + continue; + } + + InstanceSpawnGroupInfo& info = _instanceSpawnGroupStore[instanceMapId].emplace_back(); info.SpawnGroupId = spawnGroupId; info.BossStateId = fields[1].GetUInt8(); diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 33ca3786630..afdb02cb3cd 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -1996,9 +1996,6 @@ void World::SetInitialWorldSettings() TC_LOG_INFO("server.loading", "Loading Spawn Group Templates..."); sObjectMgr->LoadSpawnGroupTemplates(); - TC_LOG_INFO("server.loading", "Loading instance spawn groups..."); - sObjectMgr->LoadInstanceSpawnGroups(); - TC_LOG_INFO("server.loading", "Loading Creature Data..."); sObjectMgr->LoadCreatures(); @@ -2023,6 +2020,9 @@ void World::SetInitialWorldSettings() TC_LOG_INFO("server.loading", "Loading Spawn Group Data..."); sObjectMgr->LoadSpawnGroups(); + TC_LOG_INFO("server.loading", "Loading instance spawn groups..."); + sObjectMgr->LoadInstanceSpawnGroups(); + TC_LOG_INFO("server.loading", "Loading GameObject Addon Data..."); sObjectMgr->LoadGameObjectAddons(); // must be after LoadGameObjects() |