From a592be71f7edcb34d2f4f323a2f829ea7acc6163 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Sat, 11 Jan 2020 20:16:54 +0100 Subject: [PATCH] Core/Events: avoid looking up for battlegrounds when no battleground has been linked to an active event --- src/server/game/Events/GameEventMgr.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp index 0bd5d6479d9..2df63196437 100644 --- a/src/server/game/Events/GameEventMgr.cpp +++ b/src/server/game/Events/GameEventMgr.cpp @@ -1223,7 +1223,8 @@ void GameEventMgr::UpdateBattlegroundSettings() sBattlegroundMgr->ResetHolidays(); for (uint32 activeEventId : m_ActiveEvents) - sBattlegroundMgr->SetHolidayActive(mGameEventBattlegroundHolidays[activeEventId]); + if (uint32 battleGroundId = mGameEventBattlegroundHolidays[activeEventId]) + sBattlegroundMgr->SetHolidayActive(battleGroundId); } void GameEventMgr::UpdateEventNPCVendor(uint16 event_id, bool activate)