From 762c26f16e5a5da3164e41b2ed26ddad66464041 Mon Sep 17 00:00:00 2001 From: Hondacrx Date: Sun, 1 Sep 2024 15:23:00 -0400 Subject: [PATCH] Revert "Core/Creature: Formation reset Port From (https://github.com/TrinityCore/TrinityCore/commit/cdf0d62e48773a0c01193754383bcc95977bc552) --- Source/Game/Entities/Creature/CreatureGroups.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Source/Game/Entities/Creature/CreatureGroups.cs b/Source/Game/Entities/Creature/CreatureGroups.cs index f925f63f7..4b01c36ce 100644 --- a/Source/Game/Entities/Creature/CreatureGroups.cs +++ b/Source/Game/Entities/Creature/CreatureGroups.cs @@ -244,13 +244,16 @@ namespace Game.Entities public void FormationReset(bool dismiss) { - foreach (var creature in _members.Keys) + foreach (var (creature, _) in _members) { - if (creature != _leader && creature.IsAlive()) + if (dismiss) + creature.GetMotionMaster().Initialize(); + else creature.GetMotionMaster().MoveIdle(); + Log.outDebug(LogFilter.Unit, $"CreatureGroup::FormationReset: Set {(dismiss ? "default" : "idle")} movement for member {creature.GetGUID()}"); } - //_formed = !dismiss; + _formed = !dismiss; } public void LeaderStartedMoving()