diff options
author | Shauren <shauren.trinity@gmail.com> | 2024-07-08 11:13:17 +0200 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2024-07-08 12:44:56 +0200 |
commit | aca264e11b4600512a6eac53fb2295a9a7a8bb70 (patch) | |
tree | 187bdf3c2c4ddd2b7b0926629372a42f479d6010 /src | |
parent | 93ab97a37c769cfbc0c5d3aea44aee0e3cd877bc (diff) |
Revert "Core/Creature: Formation reset (#27040)"
This reverts commit 01da43620699fcb59d7820f676566175af0200ea.
(cherry picked from commit cdf0d62e48773a0c01193754383bcc95977bc552)
Diffstat (limited to 'src')
-rw-r--r-- | src/server/game/Entities/Creature/CreatureGroups.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
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() |