Core/Objects: Move EventProcessor update to WorldObject::Update

(cherry picked from commit 6965b2)

Author: Shauren

src/server/game/Entities/GameObject/GameObject.cpp

@@ -452,8 +452,6 @@ bool GameObject::Create(ObjectGuid::LowType guidlow, uint32 name_id, Map* map, u
 
 void GameObject::Update(uint32 diff)
 {
-    m_Events.Update(diff);
-
     WorldObject::Update(diff);
 
     if (AI())

src/server/game/Entities/Object/Object.cpp

@@ -957,6 +957,11 @@ WorldObject::~WorldObject()
     }
 }
 
+void WorldObject::Update(uint32 diff)
+{
+    m_Events.Update(diff);
+}
+
 void WorldObject::SetIsStoredInWorldObjectGridContainer(bool on)
 {
     if (!IsInWorld())
@@ -1023,6 +1028,8 @@ void WorldObject::CleanupsBeforeDelete(bool /*finalCleanup*/)
 
     if (Transport* transport = GetTransport())
         transport->RemovePassenger(this);
+
+    m_Events.KillAllEvents(false);                      // non-delatable (currently cast spells) will not deleted now but it will deleted at call in Map::RemoveAllObjectsInRemoveList
 }
 
 void WorldObject::UpdatePositionData()

src/server/game/Entities/Object/Object.h

@@ -339,7 +339,7 @@ class TC_GAME_API WorldObject : public Object, public WorldLocation
     public:
         virtual ~WorldObject();
 
-        virtual void Update(uint32 /*time_diff*/) { }
+        virtual void Update(uint32 diff);
 
         void AddToWorld() override;
         void RemoveFromWorld() override;

src/server/game/Entities/Unit/Unit.cpp

@@ -434,7 +434,7 @@ void Unit::Update(uint32 p_time)
     // WARNING! Order of execution here is important, do not change.
     // Spells must be processed with event system BEFORE they go to _UpdateSpells.
     // Or else we may have some SPELL_STATE_FINISHED spells stalled in pointers, that is bad.
-    m_Events.Update(p_time);
+    WorldObject::Update(p_time);
 
     CheckPendingMovementAcks();
 
@@ -443,8 +443,6 @@ void Unit::Update(uint32 p_time)
 
     _UpdateSpells(p_time);
 
-    WorldObject::Update(p_time);
-
     // If this is set during update SetCantProc(false) call is missing somewhere in the code
     // Having this would prevent spells from being proced, so let's crash
     ASSERT(!m_procDeep);
@@ -9668,7 +9666,6 @@ void Unit::CleanupBeforeRemoveFromMap(bool finalCleanup)
     if (finalCleanup)
         m_cleanupDone = true;
 
-    m_Events.KillAllEvents(false);                      // non-delatable (currently cast spells) will not deleted now but it will deleted at call in Map::RemoveAllObjectsInRemoveList
     CombatStop();
     ClearComboPoints();
     ClearComboPointHolders();

src/server/game/Scripting/ScriptMgr.cpp

@@ -404,6 +404,10 @@ class CreatureGameObjectScriptRegistrySwapHooks
     // Hook which is called before a gameobject is swapped
     static void UnloadResetScript(GameObject* gameobject)
     {
+        // Remove deletable events only,
+        // otherwise it causes crashes with non-deletable spell events.
+        gameobject->m_Events.KillAllEvents(false);
+
         gameobject->AI()->Reset();
     }