Core/Creatures: Only remove formation movement on formation remove instead of fully resetting MotionMaster

Shauren · Shauren · commit 6679ecfeba25 · 2024-07-08T12:45:33.000+02:00
(cherry picked from commit 67dd9a920fdabb26e6429432885345b1a1771b9a)
diff --git a/src/server/game/Entities/Creature/CreatureGroups.cpp b/src/server/game/Entities/Creature/CreatureGroups.cpp
@@ -266,7 +266,7 @@ void CreatureGroup::FormationReset(bool dismiss)
         if (pair.first != _leader && pair.first->IsAlive())
         {
             if (dismiss)
-                pair.first->GetMotionMaster()->Initialize();
+                pair.first->GetMotionMaster()->Remove(FORMATION_MOTION_TYPE, MOTION_SLOT_DEFAULT);
             else
                 pair.first->GetMotionMaster()->MoveIdle();
             TC_LOG_DEBUG("entities.unit", "CreatureGroup::FormationReset: Set {} movement for member {}", dismiss ? "default" : "idle", pair.first->GetGUID().ToString());

Original file line number	Diff line number	Diff line change
`@@ -266,7 +266,7 @@ void CreatureGroup::FormationReset(bool dismiss)`
`266`	`266`	`if (pair.first != _leader && pair.first->IsAlive())`
`267`	`267`	`{`
`268`	`268`	`if (dismiss)`
`269`		`- pair.first->GetMotionMaster()->Initialize();`
	`269`	`+ pair.first->GetMotionMaster()->Remove(FORMATION_MOTION_TYPE, MOTION_SLOT_DEFAULT);`
`270`	`270`	`else`
`271`	`271`	`pair.first->GetMotionMaster()->MoveIdle();`
`272`	`272`	`TC_LOG_DEBUG("entities.unit", "CreatureGroup::FormationReset: Set {} movement for member {}", dismiss ? "default" : "idle", pair.first->GetGUID().ToString());`