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:03:48 +0200 |
| commit | 0c97ef5f74ecd30a16965719b857d0ba71580fbf (patch) | |
| tree | d57d8ba8cecf1b9b092fe1b4f3a1f19b3799e12c | |
| parent | fe3a0bf7e135cf8ba9035c4d3c271969d2915aaa (diff) | |
Core/Unit: Force cancel unit events before invalidating the object on destruction
* Closes #16675
| -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 ce3f6e2a150..f790d6bf807 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -289,9 +289,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; |