diff options
| author | Jinnaix <37972361+Jinnaix@users.noreply.github.com> | 2021-10-13 17:20:29 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-03-20 00:19:42 +0100 |
| commit | 01da43620699fcb59d7820f676566175af0200ea (patch) | |
| tree | da28c12d7416161372b57cc59c4c99a2296da2b7 /src | |
| parent | 66c52de27e6abaf3df3314a755bcad7ea18723f6 (diff) | |
Core/Creature: Formation reset (#27040)
* Core/Creature: Formation reset
* Update CreatureGroups.cpp
whoops
* Core/Creature: Formation reset
Keep dismiss functionality
(cherry picked from commit 7051aab4219765e0c9faac0ce7bde0160451712a)
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Creature/CreatureGroups.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/server/game/Entities/Creature/CreatureGroups.cpp b/src/server/game/Entities/Creature/CreatureGroups.cpp index f90714c162d..82f2a1b3e27 100644 --- a/src/server/game/Entities/Creature/CreatureGroups.cpp +++ b/src/server/game/Entities/Creature/CreatureGroups.cpp @@ -259,21 +259,18 @@ 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()) { - if (dismiss) - pair.first->GetMotionMaster()->Initialize(); - else - pair.first->GetMotionMaster()->MoveIdle(); - TC_LOG_DEBUG("entities.unit", "CreatureGroup::FormationReset: Set %s movement for member %s", dismiss ? "default" : "idle", pair.first->GetGUID().ToString().c_str()); + pair.first->GetMotionMaster()->MoveIdle(); + // TC_LOG_DEBUG("entities.unit", "CreatureGroup::FormationReset: Set %s movement for member %s", dismiss ? "default" : "idle", pair.first->GetGUID().ToString().c_str()); } } - _formed = !dismiss; + // _formed = !dismiss; } void CreatureGroup::LeaderStartedMoving() |