fix: (Day) Fixes issue where taunted NPCs did not cast spells/projectiles to non-taunted targets (AscensionGameDev#2105)

Author: AlexVild

Intersect.Server.Core/Entities/Entity.cs

@@ -1470,20 +1470,6 @@ public virtual void TryAttack(Entity target,
                 return;
             }
 
-            //Check for taunt status and trying to attack a target that has not taunted you.
-            foreach (var status in CachedStatuses)
-            {
-                if (status.Type == SpellEffect.Taunt)
-                {
-                    if (Target != target)
-                    {
-                        PacketSender.SendActionMsg(this, Strings.Combat.miss, CustomColors.Combat.Missed);
-
-                        return;
-                    }
-                }
-            }
-
             if (parentSpell != null)
             {
                 TryAttack(target, parentSpell);
@@ -1575,23 +1561,6 @@ public virtual void TryAttack(
                 return;
             }
 
-            //Check for taunt status and trying to attack a target that has not taunted you.
-            if (!trapTrigger) //Traps ignore taunts.
-            {
-                foreach (var status in CachedStatuses)
-                {
-                    if (status.Type == SpellEffect.Taunt)
-                    {
-                        if (Target != target)
-                        {
-                            PacketSender.SendActionMsg(this, Strings.Combat.miss, CustomColors.Combat.Missed);
-
-                            return;
-                        }
-                    }
-                }
-            }
-
             var deadAnimations = new List<KeyValuePair<Guid, Direction>>();
             var aliveAnimations = new List<KeyValuePair<Guid, Direction>>();
 

Intersect.Server.Core/Entities/Player.cs

@@ -1420,9 +1420,52 @@ public override void TryAttack(Entity target,
                 }
             }
 
+            //Check for taunt status and trying to attack a target that has not taunted you.
+            if (!ValidTauntTarget(target))
+            {
+                return;
+            }
+
             base.TryAttack(target, projectile, parentSpell, parentItem, projectileDir);
         }
 
+        //Attacking with spell
+        public override void TryAttack(
+            Entity target,
+            SpellBase spellBase,
+            bool onHitTrigger = false,
+            bool trapTrigger = false
+        )
+        {   
+            if (!trapTrigger && !ValidTauntTarget(target)) //Traps ignore taunts.
+            {
+                return;
+            }
+
+            base.TryAttack(target, spellBase, onHitTrigger, trapTrigger);
+        }
+
+        /// <summary>
+        /// Check for taunt status and trying to attack a target that has not taunted you.
+        /// </summary>
+        /// <param name="target">The target the player is attempting to attack</param>
+        /// <returns>True if the player can attack that target according to their taunt status</returns>
+        public bool ValidTauntTarget(Entity target)
+        {
+            if (CachedStatuses?.All(status => status.Type != SpellEffect.Taunt) ?? true)
+            {
+                return true;
+            }
+
+            if (Target != target)
+            {
+                PacketSender.SendActionMsg(this, Strings.Combat.miss, CustomColors.Combat.Missed);
+                return false;
+            }
+
+            return true;
+        }
+
         public void TryAttack(Entity target)
         {
             if (IsCasting)