diff options
| -rw-r--r-- | src/server/game/Entities/Creature/Creature.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 6aaf5dbcac7..d318a941784 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -3343,8 +3343,20 @@ void Creature::AtEngage(Unit* target) MovementGeneratorType const movetype = GetMotionMaster()->GetCurrentMovementGeneratorType(); if (movetype == WAYPOINT_MOTION_TYPE || movetype == POINT_MOTION_TYPE || (IsAIEnabled() && AI()->IsEscorted())) + { SetHomePosition(GetPosition()); + // if its a vehicle, set the home positon of every creature passenger at engage + // so that they are in combat range if hostile + if (Vehicle* vehicle = GetVehicleKit()) + { + for (auto seat = vehicle->Seats.begin(); seat != vehicle->Seats.end(); ++seat) + if (Unit* passenger = ObjectAccessor::GetUnit(*this, seat->second.Passenger.Guid)) + if (Creature* creature = passenger->ToCreature()) + creature->SetHomePosition(GetPosition()); + } + } + if (CreatureAI* ai = AI()) ai->JustEngagedWith(target); if (CreatureGroup* formation = GetFormation()) |