Require both aura and aura owner references to be valid for auras

ElunaTemplate.h

@@ -154,6 +154,26 @@ class ElunaObjectImpl : public ElunaObject
     TRACKABLE_PTR_NAMESPACE unique_weak_ptr<T> _obj;
 };
 
+template <>
+class ElunaObjectImpl<Aura> : public ElunaObject
+{
+public:
+    ElunaObjectImpl(Eluna* E, Aura* obj, char const* tname);
+
+    void* GetObj() const override { return _obj.lock().get(); }
+    bool IsValid() const override
+    {
+        // aura references are not invalidated when their owner (player) changes map
+        // owner reference must be checked additionally to ensure scripts don't store
+        // and access auras of players on another map (possibly updating in another thread)
+        return !_obj.expired() && !_owner.expired();
+    }
+
+private:
+    TRACKABLE_PTR_NAMESPACE unique_weak_ptr<Aura> _obj;
+    TRACKABLE_PTR_NAMESPACE unique_weak_ptr<WorldObject> _owner;
+};
+
 template <typename T>
 class ElunaObjectValueImpl : public ElunaObject
 {

LuaFunctions.cpp

@@ -50,6 +50,11 @@ TRACKABLE_PTR_NAMESPACE unique_weak_ptr<Spell> GetWeakPtrFor(Spell const* obj) {
 TRACKABLE_PTR_NAMESPACE unique_weak_ptr<Vehicle> GetWeakPtrFor(Vehicle const* obj) { return obj->GetWeakPtr(); }
 #endif
 
+ElunaObjectImpl<Aura>::ElunaObjectImpl(Eluna* E, Aura* obj, char const* tname) : ElunaObject(E, tname),
+    _obj(GetWeakPtrFor(obj)), _owner(GetWeakPtrFor(obj->GetOwner()))
+{
+}
+
 // Template by Mud from http://stackoverflow.com/questions/4484437/lua-integer-type/4485511#4485511
 template<> int ElunaTemplate<unsigned long long>::Add(lua_State* L) { Eluna* E = Eluna::GetEluna(L); E->Push(E->CHECKVAL<unsigned long long>(1) + E->CHECKVAL<unsigned long long>(2)); return 1; }
 template<> int ElunaTemplate<unsigned long long>::Substract(lua_State* L) { Eluna* E = Eluna::GetEluna(L); E->Push(E->CHECKVAL<unsigned long long>(1) - E->CHECKVAL<unsigned long long>(2)); return 1; }