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

1 files changed, 3 insertions, 4 deletions

diff --git a/src/server/game/Battlefield/Battlefield.cpp b/src/server/game/Battlefield/Battlefield.cpp
index 6542277bea1..94881ea0f32 100644
--- a/src/server/game/Battlefield/Battlefield.cpp
+++ b/src/server/game/Battlefield/Battlefield.cpp
@@ -33,10 +33,9 @@
 #include "ObjectAccessor.h"
 #include "ObjectMgr.h"
 #include "WorldSession.h"
-#include "WorldStatePackets.h"
 #include <G3D/g3dmath.h>
 
-Battlefield::Battlefield()
+Battlefield::Battlefield(Map* map)
 {
     m_Timer = 0;
     m_IsEnabled = true;
@@ -46,8 +45,8 @@ Battlefield::Battlefield()
     m_TypeId = 0;
     m_BattleId = 0;
     m_ZoneId = 0;
-    m_Map = nullptr;
-    m_MapId = 0;
+    m_Map = map;
+    m_MapId = map->GetId();
     m_MaxPlayer = 0;
     m_MinPlayer = 0;
     m_MinLevel = 0;