diff options
| author | Naios <naios-dev@live.de> | 2016-08-27 11:29:58 +0200 |
|---|---|---|
| committer | Naios <naios-dev@live.de> | 2016-08-29 22:07:14 +0200 |
| commit | cc51ae6f9a32c38cda2be30caadb879ed72f1273 (patch) | |
| tree | f20ca8c739d3e369136b2c20b372558b89f6a306 /src | |
| parent | cf63094e9f9004f9215927d66c5bede32a0dccfd (diff) | |
Core/Unit: Force cancel unit events before invalidating the object on destruction
* Closes #16675
(cherry picked from commit 0c97ef5f74ecd30a16965719b857d0ba71580fbf)
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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; |