aboutsummaryrefslogtreecommitdiff
path: root/src/game/Vehicle.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/Vehicle.cpp')
-rw-r--r--src/game/Vehicle.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/game/Vehicle.cpp b/src/game/Vehicle.cpp
index b4f93331cfb..9dd36895d56 100644
--- a/src/game/Vehicle.cpp
+++ b/src/game/Vehicle.cpp
@@ -71,7 +71,10 @@ void Vehicle::setDeathState(DeathState s) // overwrite vir
{
if(Unit *passenger = itr->second.passenger)
if(passenger->GetTypeId() == TYPEID_UNIT && ((Creature*)passenger)->isVehicle())
+ {
+ passenger->ExitVehicle();
((Vehicle*)passenger)->setDeathState(s);
+ }
}
RemoveAllPassengers();
}
@@ -298,7 +301,10 @@ void Vehicle::Dismiss()
{
if(Unit *passenger = itr->second.passenger)
if(passenger->GetTypeId() == TYPEID_UNIT && ((Creature*)passenger)->isVehicle())
+ {
+ passenger->ExitVehicle();
((Vehicle*)passenger)->Dismiss();
+ }
}
RemoveAllPassengers();
SendObjectDeSpawnAnim(GetGUID());