aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Pools/PoolMgr.cpp
diff options
context:
space:
mode:
authorjackpoz <giacomopoz@gmail.com>2020-04-11 18:13:12 +0200
committerShauren <shauren.trinity@gmail.com>2022-01-01 14:34:20 +0100
commit7eff81f9dbf93e6f1efbd77b2623a0ee881f82cf (patch)
tree9dc530e4ba0525ad95f6373092017d54535175bd /src/server/game/Pools/PoolMgr.cpp
parente4bcb65fcf7e3f71f26a5215d411bee238ba7a3c (diff)
Core/Pools: Fix crash on startup
(cherry picked from commit 9cde3ffd1404e784406f385061f4df0f6b429b61)
Diffstat (limited to 'src/server/game/Pools/PoolMgr.cpp')
-rw-r--r--src/server/game/Pools/PoolMgr.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/server/game/Pools/PoolMgr.cpp b/src/server/game/Pools/PoolMgr.cpp
index c8f410e90e7..bb5c9dfcc69 100644
--- a/src/server/game/Pools/PoolMgr.cpp
+++ b/src/server/game/Pools/PoolMgr.cpp
@@ -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);
}
}