Core/Creatures: Allow disabling melee attacks for all creatures, not just the ones using SAI

Port From (https://github.com/TrinityCore/TrinityCore/commit/d26d38075cdb56dcef77f05276a360e717cc5032)
2023-03-14 04:34:51 -04:00
parent 40898d4b9f
commit d0b7bcb2fe
7 changed files with 21 additions and 18 deletions
@@ -258,8 +258,14 @@ namespace Game.Entities

            Creature creature = ToCreature();
            // creatures cannot attack while evading
-            if (creature != null && creature.IsInEvadeMode())
-                return false;
+            if (creature != null)
+            {
+                if (creature.IsInEvadeMode())
+                    return false;
+
+                if (!creature.CanMelee())
+                    meleeAttack = false;
+            }

            // nobody can attack GM in GM-mode
            if (victim.IsTypeId(TypeId.Player))