diff options
| author | Shauren <shauren.trinity@gmail.com> | 2013-03-09 23:42:54 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2013-03-09 23:42:54 +0100 |
| commit | b3b66a8d028fafef1e71477325f467ef73626c8e (patch) | |
| tree | 77c246a0ef43647947b01ccfd2b55794aa6a9a1a /src/server/game/Entities/Unit | |
| parent | 4ee0a4a4460ff0a44f39a5359c6e234c9d31fc6b (diff) | |
Core/Vehicles: Fixed a possible crash if vehicle is deleted before its passenger runs Abort on pending join event
Closes #9392
Diffstat (limited to 'src/server/game/Entities/Unit')
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 0e93bd93433..9d581fcdce9 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -16945,9 +16945,9 @@ void Unit::_ExitVehicle(Position const* exitPosition) if (player) player->ResummonPetTemporaryUnSummonedIfAny(); - if (vehicle->GetBase()->HasUnitTypeMask(UNIT_MASK_MINION)) + if (vehicle->GetBase()->HasUnitTypeMask(UNIT_MASK_MINION) && vehicle->GetBase()->GetTypeId() == TYPEID_UNIT) if (((Minion*)vehicle->GetBase())->GetOwner() == this) - vehicle->Dismiss(); + vehicle->GetBase()->ToCreature()->DespawnOrUnsummon(); if (HasUnitTypeMask(UNIT_MASK_ACCESSORY)) { |