Core/Battlefields: Refactor Battlefield creation to be linked to host map creation instead of having globally accessible objects

1 files changed, 3 insertions, 0 deletions

diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index 4eab4881150..3c122dfd70a 100644
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -16,6 +16,7 @@
  */
 
 #include "Map.h"
+#include "BattlefieldMgr.h"
 #include "Battleground.h"
 #include "CellImpl.h"
 #include "CharacterPackets.h"
@@ -96,6 +97,7 @@ Map::~Map()
         sMapMgr->DecreaseScheduledScriptCount(m_scriptSchedule.size());
 
     sOutdoorPvPMgr->DestroyOutdoorPvPForMap(this);
+    sBattlefieldMgr->DestroyBattlefieldsForMap(this);
 
     if (m_parentMap == this)
         delete m_childTerrainMaps;
@@ -379,6 +381,7 @@ i_scriptLock(false), _respawnCheckTimer(0)
     _worldStateValues = sWorldStateMgr->GetInitialWorldStatesForMap(this);
 
     sOutdoorPvPMgr->CreateOutdoorPvPForMap(this);
+    sBattlefieldMgr->CreateBattlefieldsForMap(this);
 
     sScriptMgr->OnCreateMap(this);
 }