From 2079cd10943d11307aa02bee8b9b623df95abfca Mon Sep 17 00:00:00 2001 From: hondacrx Date: Mon, 29 Nov 2021 17:24:46 -0500 Subject: [PATCH] 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 Port From (https://github.com/TrinityCore/TrinityCore/commit/4c996bdf8be86d6659e512aba115dae5ac94aaa7) --- Source/Game/Events/GameEventManager.cs | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Source/Game/Events/GameEventManager.cs b/Source/Game/Events/GameEventManager.cs index 650b86028..4ff2864e3 100644 --- a/Source/Game/Events/GameEventManager.cs +++ b/Source/Game/Events/GameEventManager.cs @@ -393,6 +393,12 @@ namespace Game Log.outError(LogFilter.Sql, "`game_event_creature` game event id ({0}) not exist in `game_event`", event_id); continue; } + + // Log error for pooled object, but still spawn it + uint poolId = Global.PoolMgr.IsPartOfAPool(SpawnObjectType.Creature, guid); + if (poolId != 0) + Log.outError(LogFilter.Sql, $"`game_event_creature`: game event id ({event_id}) contains creature ({guid}) which is part of a pool ({poolId}). This should be spawned in game_event_pool"); + mGameEventCreatureGuids[internal_event_id].Add(guid); ++count; @@ -432,6 +438,12 @@ namespace Game Log.outError(LogFilter.Sql, "`game_event_gameobject` game event id ({0}) not exist in `game_event`", event_id); continue; } + + // Log error for pooled object, but still spawn it + uint poolId = Global.PoolMgr.IsPartOfAPool(SpawnObjectType.GameObject, guid); + if (poolId != 0) + Log.outError(LogFilter.Sql, $"`game_event_gameobject`: game event id ({event_id}) contains game object ({guid}) which is part of a pool ({poolId}). This should be spawned in game_event_pool"); + mGameEventGameobjectGuids[internal_event_id].Add(guid); ++count;