Update CMangos implementation to match Mangos (#4)

* Check that elunaEvents exists before updating timed events
* Change Eluna init code to be the same as on Mangos
* Update map hooks to reflect Mangos implementation
* Make sure Eluna exists before calling hooks

src/game/Entities/Object.cpp

@@ -1268,7 +1268,8 @@ void WorldObject::CleanupsBeforeDelete()
 void WorldObject::Update(const uint32 diff)
 {
 #ifdef BUILD_ELUNA
-    elunaEvents->Update(diff);
+    if (elunaEvents) // can be null on maps without eluna
+        elunaEvents->Update(diff);
 #endif
     m_heartBeatTimer.Update(diff);
     while (m_heartBeatTimer.Passed())
@@ -2064,8 +2065,11 @@ void WorldObject::SetMap(Map* map)
     // in single state, the timed events should move across maps
     if (!sElunaConfig->IsElunaCompatibilityMode())
     {
-        delete elunaEvents;
-        elunaEvents = nullptr; // set to null in case map doesn't use eluna
+        if (elunaEvents)
+        {
+            delete elunaEvents;
+            elunaEvents = nullptr; // set to null in case map doesn't use eluna
+        }
     }
 
     if (Eluna* e = map->GetEluna())
@@ -3313,4 +3317,4 @@ Eluna* WorldObject::GetEluna() const
 
     return nullptr;
 }
-#endif
+#endif

src/game/Maps/Map.cpp

@@ -472,11 +472,11 @@ bool Map::Add(Player* player)
     UpdateObjectVisibility(player, cell, p);
 
 #ifdef BUILD_ELUNA
-    if(Eluna* e = player->GetEluna())
+    if (Eluna* e = GetEluna())
+    {
         e->OnMapChanged(player);
-
-    if(Eluna* e = GetEluna())
         e->OnPlayerEnter(this, player);
+    }
 #endif
 
 #ifdef BUILD_SOLOCRAFT

src/game/World/World.cpp

@@ -1136,6 +1136,9 @@ void World::SetInitialWorldSettings()
     sLog.outString();
 
 #ifdef BUILD_ELUNA
+    // lua state begins uninitialized
+    eluna = nullptr;
+
     sLog.outString("Loading Eluna config...");
     sElunaConfig->Initialize();
 
@@ -1504,9 +1507,6 @@ void World::SetInitialWorldSettings()
     sTicketMgr.LoadGMTickets();
 
 #ifdef BUILD_ELUNA
-    // lua state begins uninitialized
-    eluna = nullptr;
-
     if (sElunaConfig->IsElunaEnabled())
     {
         ///- Run eluna scripts.
@@ -1651,8 +1651,8 @@ void World::SetInitialWorldSettings()
 #endif
 
 #ifdef BUILD_ELUNA
-    if (GetEluna())
-        GetEluna()->OnConfigLoad(false); // Must be done after Eluna is initialized and scripts have run
+    if (Eluna* e = GetEluna())
+        e->OnConfigLoad(false); // Must be done after Eluna is initialized and scripts have run
     sLog.outString();
 #endif
 

src/mangosd/WorldRunnable.cpp

@@ -42,7 +42,8 @@ extern int m_ServiceStatus;
 void WorldRunnable::run()
 {
 #ifdef BUILD_ELUNA
-    sWorld.GetEluna()->OnStartup();
+    if(Eluna* e = sWorld.GetEluna())
+        e->OnStartup();
 #endif
 
     ///- Init new SQL thread for the world database
@@ -85,7 +86,8 @@ void WorldRunnable::run()
 #endif
     }
 #ifdef BUILD_ELUNA
-    sWorld.GetEluna()->OnShutdown();
+    if(Eluna* e = sWorld.GetEluna())
+        e->OnShutdown();
 #endif
 
     sWorld.CleanupsBeforeStop();