From 7051aab4219765e0c9faac0ce7bde0160451712a Mon Sep 17 00:00:00 2001 From: Jinnaix <37972361+Jinnaix@users.noreply.github.com> Date: Wed, 13 Oct 2021 17:20:29 +0200 Subject: Core/Creature: Formation reset (#27040) * Core/Creature: Formation reset * Update CreatureGroups.cpp whoops * Core/Creature: Formation reset Keep dismiss functionality --- src/server/game/Entities/Creature/CreatureGroups.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/server/game/Entities/Creature/CreatureGroups.cpp b/src/server/game/Entities/Creature/CreatureGroups.cpp index 6d70541326a..6600d8a7eec 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() -- cgit v1.2.3