From aca264e11b4600512a6eac53fb2295a9a7a8bb70 Mon Sep 17 00:00:00 2001 From: Shauren Date: Mon, 8 Jul 2024 11:13:17 +0200 Subject: Revert "Core/Creature: Formation reset (#27040)" This reverts commit 01da43620699fcb59d7820f676566175af0200ea. (cherry picked from commit cdf0d62e48773a0c01193754383bcc95977bc552) --- src/server/game/Entities/Creature/CreatureGroups.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/server/game/Entities/Creature/CreatureGroups.cpp b/src/server/game/Entities/Creature/CreatureGroups.cpp index 7f926598750..c25a09c80f7 100644 --- a/src/server/game/Entities/Creature/CreatureGroups.cpp +++ b/src/server/game/Entities/Creature/CreatureGroups.cpp @@ -259,18 +259,21 @@ void CreatureGroup::MemberEngagingTarget(Creature* member, Unit* target) _engaging = false; } -void CreatureGroup::FormationReset(bool /*dismiss*/) +void CreatureGroup::FormationReset(bool dismiss) { for (auto const& pair : _members) { if (pair.first != _leader && pair.first->IsAlive()) { - pair.first->GetMotionMaster()->MoveIdle(); - // TC_LOG_DEBUG("entities.unit", "CreatureGroup::FormationReset: Set {} movement for member {}", dismiss ? "default" : "idle", pair.first->GetGUID().ToString()); + if (dismiss) + pair.first->GetMotionMaster()->Initialize(); + else + pair.first->GetMotionMaster()->MoveIdle(); + TC_LOG_DEBUG("entities.unit", "CreatureGroup::FormationReset: Set {} movement for member {}", dismiss ? "default" : "idle", pair.first->GetGUID().ToString()); } } - // _formed = !dismiss; + _formed = !dismiss; } void CreatureGroup::LeaderStartedMoving() -- cgit v1.2.3