From 775be0682a794d0a1f62d656f8c6c6dffca8de79 Mon Sep 17 00:00:00 2001 From: Shauren Date: Mon, 18 Jul 2022 22:45:03 +0200 Subject: Core/OutdoorPvP: Refactor OutdoorPvP creation to be linked to host map creation instead of having globally accessible objects --- src/server/game/Maps/Map.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/server/game/Maps/Map.cpp') diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 9b4313b0e33..4eab4881150 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -43,6 +43,7 @@ #include "ObjectAccessor.h" #include "ObjectGridLoader.h" #include "ObjectMgr.h" +#include "OutdoorPvPMgr.h" #include "Pet.h" #include "PhasingHandler.h" #include "PoolMgr.h" @@ -94,6 +95,8 @@ Map::~Map() if (!m_scriptSchedule.empty()) sMapMgr->DecreaseScheduledScriptCount(m_scriptSchedule.size()); + sOutdoorPvPMgr->DestroyOutdoorPvPForMap(this); + if (m_parentMap == this) delete m_childTerrainMaps; @@ -375,6 +378,8 @@ i_scriptLock(false), _respawnCheckTimer(0) _worldStateValues = sWorldStateMgr->GetInitialWorldStatesForMap(this); + sOutdoorPvPMgr->CreateOutdoorPvPForMap(this); + sScriptMgr->OnCreateMap(this); } -- cgit v1.2.3