From cc51ae6f9a32c38cda2be30caadb879ed72f1273 Mon Sep 17 00:00:00 2001
From: Naios <naios-dev@live.de>
Date: Sat, 27 Aug 2016 11:29:58 +0200
Subject: Core/Unit: Force cancel unit events before invalidating the object on
 destruction * Closes #16675

(cherry picked from commit 0c97ef5f74ecd30a16965719b857d0ba71580fbf)
---
 src/server/game/Entities/Unit/Unit.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 9a42b7179b3..7c71c6de367 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -314,9 +314,11 @@ Unit::~Unit()
         if (m_currentSpells[i])
         {
             m_currentSpells[i]->SetReferencedFromCurrent(false);
-            m_currentSpells[i] = NULL;
+            m_currentSpells[i] = nullptr;
         }
 
+    m_Events.KillAllEvents(true);
+
     _DeleteRemovedAuras();
 
     delete i_motionMaster;
-- 
cgit v1.2.3