aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/Creature/CreatureGroups.cpp11
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()