Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Pools: Fix crash on startup

Browse Source 
(cherry picked from commit 9cde3ffd14)
This commit is contained in:
jackpoz
2020-04-11 18:13:12 +02:00
committed by Shauren
parent e4bcb65fcf
commit 7eff81f9db
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/Events/GameEventMgr.cpp
View File

@@ -1360,7 +1360,7 @@ void GameEventMgr::GameEventUnspawn(int16 event_id)
for (IdList::iterator itr = mGameEventPoolIds[internal_event_id].begin(); itr != mGameEventPoolIds[internal_event_id].end(); ++itr)
{
sPoolMgr->DespawnPool(*itr);
sPoolMgr->DespawnPool(*itr, true);
}
}

12
src/server/game/Pools/PoolMgr.cpp
View File

@@ -232,9 +232,9 @@ void PoolGroup<GameObject>::Despawn1Object(uint64 guid, bool alwaysDeleteRespawn
// Same on one pool
template<>
void PoolGroup<Pool>::Despawn1Object(uint64 child_pool_id, bool /*alwaysDeleteRespawnTime*/)
void PoolGroup<Pool>::Despawn1Object(uint64 child_pool_id, bool alwaysDeleteRespawnTime)
{
sPoolMgr->DespawnPool(child_pool_id);
sPoolMgr->DespawnPool(child_pool_id, alwaysDeleteRespawnTime);
}
// Method for a pool only to remove any found record causing a circular dependency loop
@@ -771,22 +771,22 @@ void PoolMgr::SpawnPool(uint32 pool_id)
}
// Call to despawn a pool, all gameobjects/creatures in this pool are removed
void PoolMgr::DespawnPool(uint32 pool_id)
void PoolMgr::DespawnPool(uint32 pool_id, bool alwaysDeleteRespawnTime)
{
{
auto it = mPoolCreatureGroups.find(pool_id);
if (it != mPoolCreatureGroups.end() && !it->second.isEmpty())
it->second.DespawnObject(mSpawnedData, 0, true);
it->second.DespawnObject(mSpawnedData, 0, alwaysDeleteRespawnTime);
}
{
auto it = mPoolGameobjectGroups.find(pool_id);
if (it != mPoolGameobjectGroups.end() && !it->second.isEmpty())
it->second.DespawnObject(mSpawnedData, 0, true);
it->second.DespawnObject(mSpawnedData, 0, alwaysDeleteRespawnTime);
}
{
auto it = mPoolPoolGroups.find(pool_id);
if (it != mPoolPoolGroups.end() && !it->second.isEmpty())
it->second.DespawnObject(mSpawnedData);
it->second.DespawnObject(mSpawnedData, 0, alwaysDeleteRespawnTime);
}
}

2
src/server/game/Pools/PoolMgr.h
View File

@@ -122,7 +122,7 @@ class TC_GAME_API PoolMgr
bool CheckPool(uint32 pool_id) const;
void SpawnPool(uint32 pool_id);
void DespawnPool(uint32 pool_id);
void DespawnPool(uint32 pool_id, bool alwaysDeleteRespawnTime = false);
template<typename T>
void UpdatePool(uint32 pool_id, uint64 db_guid_or_pool_id);