Move data storage to WorldObject and add to Map

ElunaLuaEngine · Jan 14, 2024 · cfa7a98 · cfa7a98
1 parent 33ecb12
commit cfa7a98
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h
@@ -34,6 +34,9 @@
 #include <list>
 #include <set>
 #include <unordered_map>
+#ifdef ELUNA
+#include "LuaValue.h"
+#endif
 
 class Corpse;
 class Creature;
@@ -504,6 +507,8 @@ class TC_GAME_API WorldObject : public Object, public WorldLocation
         ElunaEventProcessor* elunaEvents;
 
         Eluna* GetEluna() const;
+
+        LuaVal lua_data = LuaVal({});
 #endif
 
         // Transports

diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h
@@ -30,7 +30,6 @@
 #include "PetDefines.h"
 #include "PlayerTaxi.h"
 #include "QuestDef.h"
-#include "LuaValue.h"
 #include <memory>
 #include <queue>
 #include <unordered_set>
@@ -2196,8 +2195,6 @@ class TC_GAME_API Player : public Unit, public GridObject<Player>
 
         std::string GetDebugInfo() const override;
 
-        LuaVal lua_data = LuaVal({});
-
     protected:
         // Gamemaster whisper whitelist
         GuidList WhisperList;

diff --git a/src/server/game/LuaEngine b/src/server/game/LuaEngine
diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h
@@ -36,6 +36,9 @@
 #include <list>
 #include <memory>
 #include <mutex>
+#ifdef ELUNA
+#include "LuaValue.h"
+#endif
 
 class Battleground;
 class BattlegroundMap;
@@ -821,6 +824,8 @@ class TC_GAME_API Map : public GridRefManager<NGridType>
         bool IsParentMap() const { return GetParent() == this; }
 #ifdef ELUNA
         Eluna* GetEluna() const { return eluna; }
+
+        LuaVal lua_data = LuaVal({});
 #endif
     private:
         // Type specific code for add/remove to/from grid
+7 −0		TrinityCore/MapMethods.h
+0 −7		TrinityCore/PlayerMethods.h
+8 −0		TrinityCore/WorldObjectMethods.h