From 4c996bdf8be86d6659e512aba115dae5ac94aaa7 Mon Sep 17 00:00:00 2001 From: r00ty-tc Date: Sat, 30 Mar 2019 18:46:20 +0000 Subject: Core/GameEventMgr: Log error if loading GO/Creature into event that is part of pool - Only warn, still load the GO/Creature - These should be added to game_event_pool by pool ID instead (cherry picked from commit 8bb88657f823b3e5446e250a48a2846abb10f023) --- src/server/game/Events/GameEventMgr.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/server/game') diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp index 8aaf83018b9..8977521159d 100644 --- a/src/server/game/Events/GameEventMgr.cpp +++ b/src/server/game/Events/GameEventMgr.cpp @@ -414,6 +414,10 @@ void GameEventMgr::LoadFromDB() continue; } + // Log error for pooled object, but still spawn it + if (uint32 poolId = sPoolMgr->IsPartOfAPool(SPAWN_TYPE_CREATURE, guid)) + TC_LOG_ERROR("sql.sql", "`game_event_creature`: game event id (%i) contains creature (" UI64FMTD ") which is part of a pool (%u). This should be spawned in game_event_pool", event_id, guid, poolId); + GuidList& crelist = mGameEventCreatureGuids[internal_event_id]; crelist.push_back(guid); @@ -460,6 +464,10 @@ void GameEventMgr::LoadFromDB() continue; } + // Log error for pooled object, but still spawn it + if (uint32 poolId = sPoolMgr->IsPartOfAPool(SPAWN_TYPE_GAMEOBJECT, guid)) + TC_LOG_ERROR("sql.sql", "`game_event_gameobject`: game event id (%i) contains game object (" UI64FMTD ") which is part of a pool (%u). This should be spawned in game_event_pool", event_id, guid, poolId); + GuidList& golist = mGameEventGameobjectGuids[internal_event_id]; golist.push_back(guid); -- cgit v1.2.3