From e78c696cf605867b9d7a427f5ff91e87990685fd Mon Sep 17 00:00:00 2001 From: Skjalf <47818697+Nyeriah@users.noreply.github.com> Date: Sat, 13 Nov 2021 07:33:22 -0300 Subject: [PATCH] fix(Core/Disables): Remove validation checks from DISABLE_TYPE_GAME_EVENT (#9167) Disables are loaded before game events --- src/server/game/Conditions/DisableMgr.cpp | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/server/game/Conditions/DisableMgr.cpp b/src/server/game/Conditions/DisableMgr.cpp index 66d9e3eb1..e8ac2a422 100644 --- a/src/server/game/Conditions/DisableMgr.cpp +++ b/src/server/game/Conditions/DisableMgr.cpp @@ -240,21 +240,6 @@ namespace DisableMgr } case DISABLE_TYPE_GAME_EVENT: { - GameEventMgr::GameEventDataMap const& events = sGameEventMgr->GetEventMap(); - - if (entry < 1 || entry >= events.size()) - { - LOG_ERROR("disable", "Event entry %u from `disables` does not exist, skipped.", entry); - continue; - } - - GameEventData const& eventData = events[entry]; - if (!eventData.isValid()) - { - LOG_ERROR("disable", "Event entry %u from `disables` does not exist, skipped.", entry); - continue; - } - GameEventMgr::ActiveEvents const& activeEvents = sGameEventMgr->GetActiveEventList(); if (activeEvents.find(entry) != activeEvents.end()) {