From 1f62d3caaac234bca14929ec2397befe69b85900 Mon Sep 17 00:00:00 2001 From: Shauren Date: Mon, 10 Feb 2025 18:52:18 +0100 Subject: Core/Movement: Fixed formation movement resetting state on every waypoint of its leader Closes #29950 --- src/server/game/Entities/Creature/CreatureGroups.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/server/game/Entities/Creature/CreatureGroups.cpp b/src/server/game/Entities/Creature/CreatureGroups.cpp index da6c4ba208a..97e64340f3c 100644 --- a/src/server/game/Entities/Creature/CreatureGroups.cpp +++ b/src/server/game/Entities/Creature/CreatureGroups.cpp @@ -291,7 +291,7 @@ void CreatureGroup::LeaderStartedMoving() float angle = formationInfo->FollowAngle + float(M_PI); // for some reason, someone thought it was a great idea to invert relativ angles... float dist = formationInfo->FollowDist; - if (!member->HasUnitState(UNIT_STATE_FOLLOW_FORMATION)) + if (member->GetMotionMaster()->GetCurrentMovementGeneratorType(MOTION_SLOT_DEFAULT) != FORMATION_MOTION_TYPE) member->GetMotionMaster()->MoveFormation(_leader, dist, angle, formationInfo->LeaderWaypointIDs[0], formationInfo->LeaderWaypointIDs[1]); } } -- cgit v1.2.3