Add method changes for other cores

Author: Foereaper

ElunaEventMgr.cpp

@@ -68,8 +68,8 @@ void ElunaEventProcessor::SetStates(LuaEventState state)
         return;
     }
 
-    for (EventList::iterator it = eventList.begin(); it != eventList.end(); ++it)
-        it->second->SetState(state);
+    for (auto& [time, event] : eventList)
+        event->SetState(state);
 
     if (state == LUAEVENT_STATE_ERASE)
         eventMap.clear();
@@ -83,8 +83,8 @@ void ElunaEventProcessor::ClearAllEvents()
         return;
     }
 
-    for (EventList::iterator it = eventList.begin(); it != eventList.end(); ++it)
-        RemoveEvent(it->second);
+    for (auto& [time, event] : eventList)
+        RemoveEvent(event);
 
     deferredOps.clear();
     eventList.clear();

methods/CMangos/WorldObjectMethods.h

@@ -766,7 +766,15 @@ namespace LuaWorldObject
         int functionRef = luaL_ref(E->L, LUA_REGISTRYINDEX);
         if (functionRef != LUA_REFNIL && functionRef != LUA_NOREF)
         {
-            obj->GetElunaEvents(E->GetBoundMapId())->AddEvent(functionRef, min, max, repeats);
+            ElunaEventProcessor* proc = obj->GetElunaEvents(E->GetBoundMapId());
+            if (!proc)
+            {
+                luaL_unref(E->L, LUA_REGISTRYINDEX, functionRef);
+                E->Push();
+                return 1;
+            }
+
+            proc->AddEvent(functionRef, min, max, repeats);
             E->Push(functionRef);
         }
         return 1;
@@ -780,7 +788,12 @@ namespace LuaWorldObject
     int RemoveEventById(Eluna* E, WorldObject* obj)
     {
         int eventId = E->CHECKVAL<int>(2);
-        obj->GetElunaEvents(E->GetBoundMapId())->SetState(eventId, LUAEVENT_STATE_ABORT);
+        
+        ElunaEventProcessor* proc = obj->GetElunaEvents(E->GetBoundMapId());
+        if (!proc)
+            return 0;
+
+        proc->SetState(eventId, LUAEVENT_STATE_ABORT);
         return 0;
     }
 
@@ -790,7 +803,11 @@ namespace LuaWorldObject
      */
     int RemoveEvents(Eluna* E, WorldObject* obj)
     {
-        obj->GetElunaEvents(E->GetBoundMapId())->SetStates(LUAEVENT_STATE_ABORT);
+        ElunaEventProcessor* proc = obj->GetElunaEvents(E->GetBoundMapId());
+        if (!proc)
+            return 0;
+
+        proc->SetStates(LUAEVENT_STATE_ABORT);
         return 0;
     }
 

methods/Mangos/WorldObjectMethods.h

@@ -768,7 +768,15 @@ namespace LuaWorldObject
         int functionRef = luaL_ref(E->L, LUA_REGISTRYINDEX);
         if (functionRef != LUA_REFNIL && functionRef != LUA_NOREF)
         {
-            obj->elunaEvents->AddEvent(functionRef, min, max, repeats);
+            ElunaEventProcessor* proc = obj->GetElunaEvents(E->GetBoundMapId());
+            if (!proc)
+            {
+                luaL_unref(E->L, LUA_REGISTRYINDEX, functionRef);
+                E->Push();
+                return 1;
+            }
+
+            proc->AddEvent(functionRef, min, max, repeats);
             E->Push(functionRef);
         }
         return 1;
@@ -782,17 +790,26 @@ namespace LuaWorldObject
     int RemoveEventById(Eluna* E, WorldObject* obj)
     {
         int eventId = E->CHECKVAL<int>(2);
-        obj->elunaEvents->SetState(eventId, LUAEVENT_STATE_ABORT);
+        
+        ElunaEventProcessor* proc = obj->GetElunaEvents(E->GetBoundMapId());
+        if (!proc)
+            return 0;
+
+        proc->SetState(eventId, LUAEVENT_STATE_ABORT);
         return 0;
     }
 
     /**
      * Removes all timed events from a [WorldObject]
      *
      */
-    int RemoveEvents(Eluna* /*E*/, WorldObject* obj)
+    int RemoveEvents(Eluna* E, WorldObject* obj)
     {
-        obj->elunaEvents->SetStates(LUAEVENT_STATE_ABORT);
+        ElunaEventProcessor* proc = obj->GetElunaEvents(E->GetBoundMapId());
+        if (!proc)
+            return 0;
+
+        proc->SetStates(LUAEVENT_STATE_ABORT);
         return 0;
     }
 

methods/VMangos/WorldObjectMethods.h

@@ -735,7 +735,15 @@ namespace LuaWorldObject
         int functionRef = luaL_ref(E->L, LUA_REGISTRYINDEX);
         if (functionRef != LUA_REFNIL && functionRef != LUA_NOREF)
         {
-            obj->GetElunaEvents(E->GetBoundMapId())->AddEvent(functionRef, min, max, repeats);
+            ElunaEventProcessor* proc = obj->GetElunaEvents(E->GetBoundMapId());
+            if (!proc)
+            {
+                luaL_unref(E->L, LUA_REGISTRYINDEX, functionRef);
+                E->Push();
+                return 1;
+            }
+
+            proc->AddEvent(functionRef, min, max, repeats);
             E->Push(functionRef);
         }
         return 1;
@@ -749,7 +757,12 @@ namespace LuaWorldObject
     int RemoveEventById(Eluna* E, WorldObject* obj)
     {
         int eventId = E->CHECKVAL<int>(2);
-        obj->GetElunaEvents(E->GetBoundMapId())->SetState(eventId, LUAEVENT_STATE_ABORT);
+        
+        ElunaEventProcessor* proc = obj->GetElunaEvents(E->GetBoundMapId());
+        if (!proc)
+            return 0;
+
+        proc->SetState(eventId, LUAEVENT_STATE_ABORT);
         return 0;
     }
 
@@ -759,7 +772,11 @@ namespace LuaWorldObject
      */
     int RemoveEvents(Eluna* E, WorldObject* obj)
     {
-        obj->GetElunaEvents(E->GetBoundMapId())->SetStates(LUAEVENT_STATE_ABORT);
+        ElunaEventProcessor* proc = obj->GetElunaEvents(E->GetBoundMapId());
+        if (!proc)
+            return 0;
+
+        proc->SetStates(LUAEVENT_STATE_ABORT);
         return 0;
     }