From 5e29a231c943852033d45156f2cfa89f67988d25 Mon Sep 17 00:00:00 2001
From: hondacrx <prelude_20032002@yahoo.com>
Date: Tue, 2 Nov 2021 14:16:25 -0400
Subject: [PATCH] Core/Entities: Fixed an issue where creatures would not
 properly assist formation members in certain scenarios.

Port From (https://github.com/TrinityCore/TrinityCore/commit/00b9c23e28dc19a3a9f45d1d5b86d203f55b2a7e)
---
 Source/Game/Combat/ThreatManager.cs      | 4 ++++
 Source/Game/Entities/Unit/Unit.Combat.cs | 8 --------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/Source/Game/Combat/ThreatManager.cs b/Source/Game/Combat/ThreatManager.cs
index 8741041ec..bc2f243fa 100644
--- a/Source/Game/Combat/ThreatManager.cs
+++ b/Source/Game/Combat/ThreatManager.cs
@@ -306,6 +306,10 @@ namespace Game.Combat
                 CreatureAI ownerAI = cOwner.GetAI();
                 if (ownerAI != null)
                     ownerAI.JustEngagedWith(target);
+
+                CreatureGroup formation = cOwner.GetFormation();
+                if (formation != null)
+                    formation.MemberEngagingTarget(cOwner, target);
             }
         }
 
diff --git a/Source/Game/Entities/Unit/Unit.Combat.cs b/Source/Game/Entities/Unit/Unit.Combat.cs
index a4c12c232..c157bc596 100644
--- a/Source/Game/Entities/Unit/Unit.Combat.cs
+++ b/Source/Game/Entities/Unit/Unit.Combat.cs
@@ -108,14 +108,6 @@ namespace Game.Entities
                 m_threatManager.AddThreat(enemy, 0.0f, null, true, true);
             else
                 SetInCombatWith(enemy);
-
-            Creature creature = ToCreature();
-            if (creature != null)
-            {
-                CreatureGroup formation = creature.GetFormation();
-                if (formation != null)
-                    formation.MemberEngagingTarget(creature, enemy);
-            }
         }
 
         public void ClearInCombat() { m_combatManager.EndAllCombat(); }