From acf5ce58a7d3ced306eeebd60dbc36732b21ad56 Mon Sep 17 00:00:00 2001 From: Gildor Date: Wed, 13 Dec 2023 13:08:36 +0100 Subject: Core/Creatures: Update HomePosition upon ExitVehicle only if the creature was inside a vehicle (#29491) --- src/server/game/Entities/Creature/Creature.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src') 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()); } -- cgit v1.2.3