Fix crash on BG creation

ElunaLuaEngine · Feb 2, 2024 · 5cb2f0f · 5cb2f0f
1 parent ff0850b
commit 5cb2f0f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/server/game/Battlegrounds/Battleground.cpp b/src/server/game/Battlegrounds/Battleground.cpp
@@ -993,11 +993,6 @@ void Battleground::StartBattleground()
     // and it doesn't matter if we call StartBattleground() more times, because m_Battlegrounds is a map and instance id never changes
     sBattlegroundMgr->AddBattleground(this);
 
-#ifdef ELUNA
-    if (Eluna* e = GetBgMap()->GetEluna())
-        e->OnBGCreate(this, GetTypeID(), GetInstanceID());
-#endif
-
     if (m_IsRated)
         TC_LOG_DEBUG("bg.arena", "Arena match type: {} for Team1Id: {} - Team2Id: {} started.", m_ArenaType, m_ArenaTeamIds[TEAM_ALLIANCE], m_ArenaTeamIds[TEAM_HORDE]);
 }

diff --git a/src/server/game/Maps/MapInstanced.cpp b/src/server/game/Maps/MapInstanced.cpp
@@ -29,6 +29,10 @@
 #include "VMapManager2.h"
 #include "World.h"
 
+#ifdef ELUNA
+#include "LuaEngine.h"
+#endif
+
 MapInstanced::MapInstanced(uint32 id, time_t expiry) : Map(id, expiry, 0, DUNGEON_DIFFICULTY_NORMAL)
 {
     // fill with zero
@@ -263,6 +267,12 @@ BattlegroundMap* MapInstanced::CreateBattleground(uint32 InstanceId, Battlegroun
     bg->SetBgMap(map);
 
     m_InstancedMaps[InstanceId] = map;
+
+#ifdef ELUNA
+    if (Eluna* e = map->GetEluna())
+        e->OnBGCreate(bg, bg->GetTypeID(), InstanceId);
+#endif
+
     return map;
 }