Move Map OnCreate hook to better location

Eluna-Ports · Oct 18, 2024 · 6459fed · 6459fed
1 parent c6d30f6
commit 6459fed
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/game/Maps/Map.cpp b/src/game/Maps/Map.cpp
@@ -194,9 +194,6 @@ Map::Map(uint32 id, time_t expiry, uint32 InstanceId, uint8 SpawnMode)
 
     if (sElunaConfig->IsElunaEnabled() && !sElunaConfig->IsElunaCompatibilityMode() && sElunaConfig->ShouldMapLoadEluna(id))
         eluna = new Eluna(this);
-
-    if (Eluna* e = GetEluna())
-        e->OnCreate(this);
 #endif
 }
 

diff --git a/src/game/Maps/MapManager.cpp b/src/game/Maps/MapManager.cpp
@@ -31,6 +31,7 @@
 #include <future>
 
 #ifdef BUILD_ELUNA
+#include "LuaEngine/LuaEngine.h"
 #include "LuaEngine/ElunaConfig.h"
 #endif
 
@@ -159,6 +160,11 @@ Map* MapManager::CreateMap(uint32 id, const WorldObject* obj)
         }
     }
 
+#ifdef BUILD_ELUNA
+    if (Eluna* e = m->GetEluna())
+        e->OnCreate(m);
+#endif
+
     return m;
 }