Temporarily revert event rescheduling logic

Author: Foereaper

ElunaEventMgr.cpp

@@ -47,20 +47,14 @@ 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)
                 AddEvent(luaEvent); // Reschedule before calling incase RemoveEvents used
 
             // Call the timed event
-            E->OnTimedEvent(luaEvent->funcRef, delay, luaEvent->repeats ? luaEvent->repeats-- : luaEvent->repeats, obj);
+            if(!obj || (obj && obj->IsInWorld()))
+                E->OnTimedEvent(luaEvent->funcRef, delay, luaEvent->repeats ? luaEvent->repeats-- : luaEvent->repeats, obj);
 
             if (!remove)
                 continue;
@@ -96,12 +90,10 @@ void ElunaEventProcessor::SetState(int eventId, LuaEventState state)
         eventMap.erase(eventId);
 }
 
-void ElunaEventProcessor::AddEvent(LuaEvent* luaEvent, bool reschedule)
+void ElunaEventProcessor::AddEvent(LuaEvent* luaEvent)
 {
-    if (reschedule)
-        luaEvent->GenerateDelay();
-
-    eventList.insert(std::pair<uint64, LuaEvent*>(m_time + reschedule ? luaEvent->delay : 0, luaEvent));
+    luaEvent->GenerateDelay();
+    eventList.insert(std::pair<uint64, LuaEvent*>(m_time + luaEvent->delay, luaEvent));
     eventMap[luaEvent->funcRef] = luaEvent;
 }
 

ElunaEventMgr.h

@@ -83,7 +83,7 @@ class ElunaEventProcessor
 
 private:
     void RemoveEvents_internal();
-    void AddEvent(LuaEvent* luaEvent, bool reschedule = true);
+    void AddEvent(LuaEvent* luaEvent);
     void RemoveEvent(LuaEvent* luaEvent);
     EventList eventList;
     uint64 m_time;