More EventMgr work

Author: Foereaper

ElunaMgr.cpp

@@ -5,6 +5,7 @@
 */
 
 #include "ElunaMgr.h"
+#include "LuaEngine.h"
 
 ElunaMgr::ElunaMgr()
 {
@@ -29,7 +30,7 @@ void ElunaMgr::Create(Map* map, ElunaInfo const& info)
     _elunaMap.emplace(info.key, std::make_unique<Eluna>(map));
 }
 
-Eluna* ElunaMgr::Get(uint64_t key) const
+Eluna* ElunaMgr::Get(uint64 key) const
 {
     auto it = _elunaMap.find(key);
     if (it != _elunaMap.end())
@@ -43,7 +44,7 @@ Eluna* ElunaMgr::Get(ElunaInfo const& info) const
     return Get(info.key);
 }
 
-void ElunaMgr::Destroy(uint64_t key)
+void ElunaMgr::Destroy(uint64 key)
 {
     _elunaMap.erase(key);
 }
@@ -55,5 +56,14 @@ void ElunaMgr::Destroy(ElunaInfo const& info)
 
 Eluna* ElunaInfo::GetEluna() const
 {
-    return sElunaMgr->Get(key);
+    if (sElunaMgr)
+        return sElunaMgr->Get(key);
+
+    return nullptr;
+}
+
+ElunaInfo::~ElunaInfo()
+{
+    if (sElunaMgr)
+        sElunaMgr->Destroy(key);
 }

ElunaMgr.h

@@ -7,23 +7,25 @@
 #ifndef _ELUNAMGR_H
 #define _ELUNAMGR_H
 
-#include "LuaEngine.h"
-
 #include <unordered_map>
 #include <memory>
 
+class Eluna;
+
 struct ElunaInfo
 {
-    uint32_t mapId;
-    uint32_t instanceId;
-    uint64_t key;
+    uint32 mapId;
+    uint32 instanceId;
+    uint64 key;
 
-    ElunaInfo(uint32_t map, uint32_t instance)
+    ElunaInfo(uint32 map, uint32 instance)
         : mapId(map), instanceId(instance)
     {
-        key = (static_cast<uint64_t>(mapId) << 32) | instanceId;
+        key = (static_cast<uint64>(mapId) << 32) | instanceId;
     }
 
+    ~ElunaInfo();
+
     // Getter to fetch Eluna object
     Eluna* GetEluna() const;
 };
@@ -41,14 +43,14 @@ class ElunaMgr
 
     void Create(Map* map, ElunaInfo const& info);
 
-    Eluna* Get(uint64_t key) const;
+    Eluna* Get(uint64 key) const;
     Eluna* Get(ElunaInfo const& info) const;
 
-    void Destroy(uint64_t key);
+    void Destroy(uint64 key);
     void Destroy(ElunaInfo const& info);
 
 private:
-    std::unordered_map<uint64_t, std::unique_ptr<Eluna>> _elunaMap;
+    std::unordered_map<uint64, std::unique_ptr<Eluna>> _elunaMap;
 };
 
 #define sElunaMgr ElunaMgr::instance()