diff options
| -rw-r--r-- | src/server/game/Entities/Creature/Creature.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 089a414f7a2..900ae1b9d16 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -3387,9 +3387,11 @@ std::string Creature::GetDebugInfo() const void Creature::ExitVehicle(Position const* /*exitPosition*/) { + bool const isInVehicle = GetVehicle(); Unit::ExitVehicle(); - // if the creature exits a vehicle, set it's home position to the + // if alive creature exits a vehicle, set it's home position to the // exited position so it won't run away (home) and evade if it's hostile - SetHomePosition(GetPosition()); + if (isInVehicle && IsAlive()) + SetHomePosition(GetPosition()); } |