*Exit vehicle when players or vehicles are dead. This may fix some crash.

--HG--
branch : trunk

1 files changed, 3 insertions, 0 deletions

diff --git a/src/game/Vehicle.cpp b/src/game/Vehicle.cpp
index 4dd38e9d41e..1a8118c7990 100644
--- a/src/game/Vehicle.cpp
+++ b/src/game/Vehicle.cpp
@@ -52,6 +52,9 @@ void Vehicle::RemoveFromWorld()
 
 void Vehicle::setDeathState(DeathState s)                       // overwrite virtual Creature::setDeathState and Unit::setDeathState
 {
+    if(Unit *charmer = GetCharmer())
+        if(charmer->GetTypeId() == TYPEID_PLAYER)
+            ((Player*)charmer)->ExitVehicle(this);
     Creature::setDeathState(s);
 }