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

Core/Pooling: Remove respawn times from the database when despawning a pool (#24422)

Browse Source 
* Core/Pooling: Remove respawn times from the database when despawning a pool

Remove respawn times from the database when despawning a pool. This is needed when a Game Event ends but there are still some respawn times saved in the database.

* Remove respawn time of active pool objects even if they are not spawned

(cherry picked from commit 4f33fd3932)
This commit is contained in:
Giacomo Pozzoni
2020-04-11 12:07:57 +00:00
committed by Shauren
parent 281e695c56
commit 97c1d01cbb
4 changed files with 66 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -140,7 +140,7 @@ bool PoolGroup<T>::CheckPool() const
// If no guid is passed, the pool is just removed (event end case)
// If guid is filled, cache will be used and no removal will occur, it just fill the cache
template<class T>
void PoolGroup<T>::DespawnObject(ActivePoolData& spawns, uint64 guid)
void PoolGroup<T>::DespawnObject(ActivePoolData& spawns, uint64 guid, bool alwaysDeleteRespawnTime)
{
for (size_t i=0; i < EqualChanced.size(); ++i)
{
@@ -149,10 +149,12 @@ void PoolGroup<T>::DespawnObject(ActivePoolData& spawns, uint64 guid)
{
if (!guid || EqualChanced[i].guid == guid)
{
Despawn1Object(EqualChanced[i].guid);
Despawn1Object(EqualChanced[i].guid, alwaysDeleteRespawnTime);
spawns.RemoveObject<T>(EqualChanced[i].guid, poolId);
}
}
else if (alwaysDeleteRespawnTime)
RemoveRespawnTimeFromDB(EqualChanced[i].guid);
}
for (size_t i = 0; i < ExplicitlyChanced.size(); ++i)
@@ -162,16 +164,18 @@ void PoolGroup<T>::DespawnObject(ActivePoolData& spawns, uint64 guid)
{
if (!guid || ExplicitlyChanced[i].guid == guid)
{
Despawn1Object(ExplicitlyChanced[i].guid);
Despawn1Object(ExplicitlyChanced[i].guid, alwaysDeleteRespawnTime);
spawns.RemoveObject<T>(ExplicitlyChanced[i].guid, poolId);
}
}
else if (alwaysDeleteRespawnTime)
RemoveRespawnTimeFromDB(ExplicitlyChanced[i].guid);
}
}
// Method that is actualy doing the removal job on one creature
template<>
void PoolGroup<Creature>::Despawn1Object(uint64 guid)
void PoolGroup<Creature>::Despawn1Object(uint64 guid, bool alwaysDeleteRespawnTime)
{
if (CreatureData const* data = sObjectMgr->GetCreatureData(guid))
{
@@ -190,13 +194,16 @@ void PoolGroup<Creature>::Despawn1Object(uint64 guid)
creature->SaveRespawnTime();
creature->AddObjectToRemoveList();
}
if (alwaysDeleteRespawnTime)
map->RemoveRespawnTime(SpawnObjectType::SPAWN_TYPE_CREATURE, guid, nullptr, true);
}
}
}
// Same on one gameobject
template<>
void PoolGroup<GameObject>::Despawn1Object(uint64 guid)
void PoolGroup<GameObject>::Despawn1Object(uint64 guid, bool alwaysDeleteRespawnTime)
{
if (GameObjectData const* data = sObjectMgr->GetGameObjectData(guid))
{
@@ -216,13 +223,16 @@ void PoolGroup<GameObject>::Despawn1Object(uint64 guid)
go->SaveRespawnTime();
go->AddObjectToRemoveList();
}
if (alwaysDeleteRespawnTime)
map->RemoveRespawnTime(SpawnObjectType::SPAWN_TYPE_GAMEOBJECT, guid, nullptr, true);
}
}
}
// Same on one pool
template<>
void PoolGroup<Pool>::Despawn1Object(uint64 child_pool_id)
void PoolGroup<Pool>::Despawn1Object(uint64 child_pool_id, bool /*alwaysDeleteRespawnTime*/)
{
sPoolMgr->DespawnPool(child_pool_id);
}
@@ -380,6 +390,35 @@ void PoolGroup<GameObject>::ReSpawn1Object(PoolObject* /*obj*/)
template <>
void PoolGroup<Pool>::ReSpawn1Object(PoolObject* /*obj*/) { }
template <>
void PoolGroup<Creature>::RemoveRespawnTimeFromDB(uint64 guid)
{
if (CreatureData const* data = sObjectMgr->GetCreatureData(guid))
{
Map* map = sMapMgr->CreateBaseMap(data->mapId);
if (!map->Instanceable())
{
map->RemoveRespawnTime(SPAWN_TYPE_CREATURE, guid, nullptr, true);
}
}
}
template <>
void PoolGroup<GameObject>::RemoveRespawnTimeFromDB(uint64 guid)
{
if (GameObjectData const* data = sObjectMgr->GetGameObjectData(guid))
{
Map* map = sMapMgr->CreateBaseMap(data->mapId);
if (!map->Instanceable())
{
map->RemoveRespawnTime(SPAWN_TYPE_GAMEOBJECT, guid, nullptr, true);
}
}
}
template <>
void PoolGroup<Pool>::RemoveRespawnTimeFromDB(uint64 /*guid*/) { }
////////////////////////////////////////////////////////////
// Methods of class PoolMgr
@@ -737,12 +776,12 @@ void PoolMgr::DespawnPool(uint32 pool_id)
{
auto it = mPoolCreatureGroups.find(pool_id);
if (it != mPoolCreatureGroups.end() && !it->second.isEmpty())
it->second.DespawnObject(mSpawnedData);
it->second.DespawnObject(mSpawnedData, 0, true);
}
{
auto it = mPoolGameobjectGroups.find(pool_id);
if (it != mPoolGameobjectGroups.end() && !it->second.isEmpty())
it->second.DespawnObject(mSpawnedData);
it->second.DespawnObject(mSpawnedData, 0, true);
}
{
auto it = mPoolPoolGroups.find(pool_id);