diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/server/game/Entities/Unit/Unit.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 70ca35b7203..916121dc10b 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -281,7 +281,6 @@ Unit::~Unit() _DeleteRemovedAuras(); delete m_charmInfo; - delete m_vehicleKit; delete movespline; ASSERT(!m_duringRemoveFromWorld); @@ -13683,7 +13682,11 @@ void Unit::RemoveFromWorld() { m_duringRemoveFromWorld = true; if (IsVehicle()) + { GetVehicleKit()->Uninstall(); + delete m_vehicleKit; + m_vehicleKit = NULL; + } RemoveCharmAuras(); RemoveBindSightAuras(); @@ -13692,6 +13695,7 @@ void Unit::RemoveFromWorld() RemoveAllGameObjects(); RemoveAllDynObjects(); + ExitVehicle(); // Remove applied auras with SPELL_AURA_CONTROL_VEHICLE UnsummonAllTotems(); RemoveAllControlled(); |