Fix crashes on startup

Eluna-Ports · Feb 6, 2024 · f37c02f · f37c02f
1 parent ab41917
commit f37c02f
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 21 deletions.
diff --git a/src/game/BattleGround/BattleGround.cpp b/src/game/BattleGround/BattleGround.cpp
@@ -459,6 +459,11 @@ void BattleGround::Update(uint32 diff)
             m_events |= BG_STARTING_EVENT_4;
 
             StartingEventOpenDoors();
+
+#ifdef BUILD_ELUNA
+            if (Eluna* e = GetBgMap()->GetEluna())
+                e->OnBGStart(this, GetTypeId(), GetInstanceId());
+#endif
 
             if (m_startMessageIds[BG_STARTING_EVENT_FOURTH])
                 SendMessageToAll(m_startMessageIds[BG_STARTING_EVENT_FOURTH], CHAT_MSG_BG_SYSTEM_NEUTRAL);
@@ -1482,7 +1487,7 @@ void BattleGround::StartBattleGround()
 
 #ifdef BUILD_ELUNA
     if (Eluna* e = GetBgMap()->GetEluna())
-        e->OnBGStart(this, GetTypeId(), GetInstanceId());
+        e->OnBGCreate(this, GetTypeId(), GetInstanceId());
 #endif
 }
 

diff --git a/src/game/BattleGround/BattleGroundMgr.cpp b/src/game/BattleGround/BattleGroundMgr.cpp
@@ -1887,11 +1887,6 @@ uint32 BattleGroundMgr::CreateBattleGround(BattleGroundTypeId bgTypeId, bool IsA
     // add bg to update list
     AddBattleGround(bg->GetInstanceId(), bg->GetTypeId(), bg);
 
-#ifdef BUILD_ELUNA
-    if (Eluna* e = bg->GetBgMap()->GetEluna())
-        e->OnBGCreate(bg, bgTypeId, bg->GetInstanceId());
-#endif
-
     // return some not-null value, bgTypeId is good enough for me
     return bgTypeId;
 }

diff --git a/src/game/World/World.cpp b/src/game/World/World.cpp
@@ -927,8 +927,11 @@ void World::LoadConfigSettings(bool reload)
 
     setConfig(CONFIG_UINT32_SUNSREACH_COUNTER, "Sunsreach.CounterMax", 10000);
 #ifdef BUILD_ELUNA
-    if (Eluna* e = GetEluna())
-        e->OnConfigLoad(reload);
+    if (reload)
+    {
+        if (Eluna* e = GetEluna())
+            e->OnConfigLoad(reload);
+    }
 #endif
 
 #ifdef BUILD_SOLOCRAFT
@@ -1660,6 +1663,20 @@ void World::SetInitialWorldSettings()
     sLog.outString("Loading GM tickets...");
     sTicketMgr.LoadGMTickets();
 
+#ifdef BUILD_ELUNA
+    // lua state begins uninitialized
+    eluna = nullptr;
+
+    if (sElunaConfig->IsElunaEnabled())
+    {
+        ///- Run eluna scripts.
+        sLog.outString("Starting Eluna world state...");
+        // use map id -1 for the global Eluna state
+        eluna = new Eluna(nullptr, sElunaConfig->IsElunaCompatibilityMode());
+        sLog.outString();
+    }
+#endif
+
     ///- Load and initialize EventAI Scripts
     sLog.outString("Loading CreatureEventAI Summons...");
     sEventAIMgr.LoadCreatureEventAI_Summons(false);         // false, will checked in LoadCreatureEventAI_Scripts
@@ -1795,19 +1812,9 @@ void World::SetInitialWorldSettings()
     PlayerbotMgr::SetInitialWorldSettings();
 #endif
 #ifdef BUILD_ELUNA
-    // lua state begins uninitialized
-    eluna = nullptr;
-
-    if (sElunaConfig->IsElunaEnabled())
-    {
-        ///- Run eluna scripts.
-        sLog.outString("Starting Eluna world state...");
-        // use map id -1 for the global Eluna state
-        eluna = new Eluna(nullptr, sElunaConfig->IsElunaCompatibilityMode());
-
-        eluna->OnConfigLoad(false); // Must be done after Eluna is initialized and scripts have run
-        sLog.outString();
-    }
+    if (GetEluna())
+        GetEluna()->OnConfigLoad(false); // Must be done after Eluna is initialized and scripts have run
+    sLog.outString();
 #endif
     sLog.outString("---------------------------------------");
     sLog.outString("      CMANGOS: World initialized       ");