Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Misc: Fixed thread-unsafe access to list of objects that should be spawned in a cell

Browse Source 
Closes #29372
This commit is contained in:
Shauren
2023-10-17 15:48:02 +02:00
parent 9fc4e2ba5c
commit 7b6589c1ec
5 changed files with 46 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/server/game/Garrison/Garrison.cpp
View File

@@ -759,15 +759,18 @@ GameObject* Garrison::Plot::CreateGameObject(Map* map, GarrisonFactionIndex fact
if (building->GetGoType() == GAMEOBJECT_TYPE_GARRISON_BUILDING && building->GetGOInfo()->garrisonBuilding.SpawnMap)
{
for (CellObjectGuidsMap::value_type const& cellGuids : sObjectMgr->GetMapObjectGuids(building->GetGOInfo()->garrisonBuilding.SpawnMap, map->GetDifficultyID()))
if (CellObjectGuidsMap const* cells = sObjectMgr->GetMapObjectGuids(building->GetGOInfo()->garrisonBuilding.SpawnMap, map->GetDifficultyID()))
{
for (ObjectGuid::LowType spawnId : cellGuids.second.creatures)
if (Creature* spawn = BuildingSpawnHelper<Creature, &Creature::SetHomePosition>(building, spawnId, map))
BuildingInfo.Spawns.insert(spawn->GetGUID());
for (auto const& [cellId, guids] : *cells)
{
for (ObjectGuid::LowType spawnId : guids.gameobjects)
if (GameObject* spawn = BuildingSpawnHelper<GameObject, &GameObject::RelocateStationaryPosition>(building, spawnId, map))
BuildingInfo.Spawns.insert(spawn->GetGUID());
for (ObjectGuid::LowType spawnId : cellGuids.second.gameobjects)
if (GameObject* spawn = BuildingSpawnHelper<GameObject, &GameObject::RelocateStationaryPosition>(building, spawnId, map))
BuildingInfo.Spawns.insert(spawn->GetGUID());
for (ObjectGuid::LowType spawnId : guids.creatures)
if (Creature* spawn = BuildingSpawnHelper<Creature, &Creature::SetHomePosition>(building, spawnId, map))
BuildingInfo.Spawns.insert(spawn->GetGUID());
}
}
}