diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp index 37120f36f51..fc67aa5dfa3 100644 --- a/src/server/game/Events/GameEventMgr.cpp +++ b/src/server/game/Events/GameEventMgr.cpp @@ -28,7 +28,6 @@ #include "BattlegroundMgr.h" #include "UnitAI.h" #include "GameObjectAI.h" -#include "ScriptMgr.h" GameEventMgr* GameEventMgr::instance() { @@ -1643,13 +1642,8 @@ class GameEventAIHookWorker void Visit(std::unordered_map& gameObjectMap) { for (auto const& p : gameObjectMap) - { if (p.second->IsInWorld()) - { p.second->AI()->OnGameEvent(_activate, _eventId); - sScriptMgr->OnGameEvent(_activate, _eventId); - } - } } template diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index f8160dcc9eb..c332087470c 100644 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -1510,11 +1510,6 @@ InstanceScript* ScriptMgr::CreateInstanceData(InstanceMap* map) return tmpscript->GetInstanceScript(map); } -void ScriptMgr::OnGameEvent(bool start, uint16 eventId) -{ - FOREACH_SCRIPT(GameObjectScript)->OnGameEvent(start, eventId); -} - bool ScriptMgr::OnDummyEffect(Unit* caster, uint32 spellId, SpellEffIndex effIndex, Item* target) { ASSERT(caster); diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index ae19302c86f..9a9e8712843 100644 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -483,9 +483,6 @@ class TC_GAME_API GameObjectScript : public ScriptObject, public UpdatableScript // Called when a GameObjectAI object is needed for the gameobject. virtual GameObjectAI* GetAI(GameObject* /*go*/) const { return NULL; } - - // Called when specific game event starts. - virtual void OnGameEvent(bool /*start*/, uint16 /*eventId*/) { } }; class TC_GAME_API AreaTriggerScript : public ScriptObject @@ -986,7 +983,6 @@ class TC_GAME_API ScriptMgr void OnGameObjectStateChanged(GameObject* go, uint32 state); void OnGameObjectUpdate(GameObject* go, uint32 diff); GameObjectAI* GetGameObjectAI(GameObject* go); - void OnGameEvent(bool start, uint16 eventId); public: /* AreaTriggerScript */