Core/Vehicles: Fixed a possible crash if vehicle is deleted before its passenger runs Abort on pending join event

Closes #9392
This commit is contained in:
Shauren committed 2013-03-09 23:42:54 +01:00
1 parent 4ee0a4a446
commit b3b66a8d02
5 files changed
+35 -43

No files matched your search

+2 -2
View File
@@ -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))
{