Timed event rework (#515)

* Refactor timed event processing, ran by Eluna state update loop instead of by individual objects
* Only process events if the object is currently in the world
* Re-queue skipped events instead of not triggering

Author: Foereaper

ElunaEventMgr.cpp

@@ -47,6 +47,13 @@ void ElunaEventProcessor::Update(uint32 diff)
 
         if (luaEvent->state == LUAEVENT_STATE_RUN)
         {
+            bool shouldSkipTick = obj && !obj->IsInWorld();
+            if (shouldSkipTick)
+            {
+                AddEvent(luaEvent, false);
+                continue;
+            }
+
             uint32 delay = luaEvent->delay;
             bool remove = luaEvent->repeats == 1;
             if (!remove)
@@ -89,10 +96,12 @@ void ElunaEventProcessor::SetState(int eventId, LuaEventState state)
         eventMap.erase(eventId);
 }
 
-void ElunaEventProcessor::AddEvent(LuaEvent* luaEvent)
+void ElunaEventProcessor::AddEvent(LuaEvent* luaEvent, bool reschedule)
 {
-    luaEvent->GenerateDelay();
-    eventList.insert(std::pair<uint64, LuaEvent*>(m_time + luaEvent->delay, luaEvent));
+    if (reschedule)
+        luaEvent->GenerateDelay();
+
+    eventList.insert(std::pair<uint64, LuaEvent*>(m_time + reschedule ? luaEvent->delay : 0, luaEvent));
     eventMap[luaEvent->funcRef] = luaEvent;
 }
 
@@ -125,6 +134,14 @@ EventMgr::~EventMgr()
     globalProcessor->RemoveEvents_internal();
 }
 
+void EventMgr::UpdateProcessors(uint32 diff)
+{
+    if (!processors.empty())
+        for (ProcessorSet::const_iterator it = processors.begin(); it != processors.end(); ++it) // loop processors
+            (*it)->Update(diff);
+    globalProcessor->Update(diff);
+}
+
 void EventMgr::SetStates(LuaEventState state)
 {
     if (!processors.empty())

ElunaEventMgr.h

@@ -83,7 +83,7 @@ class ElunaEventProcessor
 
 private:
     void RemoveEvents_internal();
-    void AddEvent(LuaEvent* luaEvent);
+    void AddEvent(LuaEvent* luaEvent, bool reschedule = true);
     void RemoveEvent(LuaEvent* luaEvent);
     EventList eventList;
     uint64 m_time;
@@ -109,6 +109,8 @@ class EventMgr
     // Sets the eventId's state in all processors
     // Execute only in safe env
     void SetState(int eventId, LuaEventState state);
+
+    void UpdateProcessors(uint32 diff);
 };
 
 #endif

LuaEngine.cpp

@@ -876,7 +876,7 @@ void Eluna::UpdateEluna(uint32 diff)
 #endif
             _ReloadEluna();
 
-    eventMgr->globalProcessor->Update(diff);
+    eventMgr->UpdateProcessors(diff);
 #if defined ELUNA_TRINITY
     GetQueryProcessor().ProcessReadyCallbacks();
 #endif