diff options
author | Shauren <shauren.trinity@gmail.com> | 2022-09-23 19:27:56 +0200 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2022-09-30 20:27:35 +0200 |
commit | 6ff3d888688fd382d317de0c2dbf26af6a6e7da5 (patch) | |
tree | ca337fcb0cd63935bfedb5de550aedb7bbe8a3a4 /src/server/game/Globals/ObjectMgr.cpp | |
parent | 3aae9192a128b381109d33cb8bfb91be327266af (diff) |
Core/Spawns: Added startup error for incorrect map assignments in instance_spawn_groups
(cherry picked from commit 881950c1d5b4a98c89240a5598b8484108608a85)
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
-rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 11 |
1 files changed, 8 insertions, 3 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(); |