Only use properly constructed keys to create new Lua states

Author: Foereaper

src/server/game/LuaEngine

@@ -288,7 +288,7 @@ i_scriptLock(false), _respawnTimes(std::make_unique<RespawnListContainer>()), _r
     if (sElunaConfig->IsElunaEnabled() && sElunaConfig->ShouldMapLoadEluna(id))
         if (!IsParentMap() || (IsParentMap() && !Instanceable()))
         {
-            elunaInfo = ElunaInfo(GetId(), GetInstanceId());
+            elunaInfo.key = ElunaInfoKey::MakeKey(GetId(), GetInstanceId());
             sElunaMgr->Create(this, elunaInfo);
         }
 #endif

src/server/game/Maps/Map.cpp

@@ -48,7 +48,6 @@ class BattlegroundMap;
 class CreatureGroup;
 #ifdef ELUNA
 class Eluna;
-struct ElunaInfo;
 #endif
 class GameObjectModel;
 class Group;
@@ -791,7 +790,6 @@ class TC_GAME_API Map : public GridRefManager<NGridType>
         bool IsParentMap() const { return GetParent() == this; }
 #ifdef ELUNA
         Eluna* GetEluna() const { return sElunaMgr->Get(elunaInfo.key); }
-
         LuaVal lua_data = LuaVal({});
 #endif
     private:

src/server/game/Maps/Map.h

@@ -2131,7 +2131,7 @@ void World::SetInitialWorldSettings()
     if (sElunaConfig->IsElunaEnabled())
     {
         TC_LOG_INFO("server.loading", "Starting Eluna world state...");
-        elunaInfo = ElunaInfo(ElunaInfoKey::GLOBAL_MAP_ID, 0);
+        elunaInfo.key = ElunaInfoKey::MakeGlobalKey(0);
         sElunaMgr->Create(nullptr, elunaInfo);
     }
 #endif

src/server/game/World/World.cpp

@@ -40,7 +40,6 @@
 
 #ifdef ELUNA
 class Eluna;
-struct ElunaInfo;
 #endif
 class Player;
 class WorldPacket;