Core/Combat: Disable triggers entering combat

Port From (https://github.com/TrinityCore/TrinityCore/commit/1dfcb7086e17902f0904ee6c09bc55a229b65cc1)
2022-03-01 17:38:12 -05:00
parent 62cb6ffd33
commit 6f1b2f5cd5
3 changed files with 14 additions and 3 deletions
@@ -57,6 +57,12 @@ namespace Game.Combat
                return false;
            if (a.HasUnitState(UnitState.InFlight) || b.HasUnitState(UnitState.InFlight))
                return false;
+            Creature aCreature = a.ToCreature();
+            if (aCreature?.IsCombatDisallowed())
+                return false;
+            Creature bCreature = b.ToCreature();
+            if (bCreature?.IsCombatDisallowed())
+                return false;
            if (a.IsFriendlyTo(b) || b.IsFriendlyTo(a))
                return false;
            Player playerA = a.GetCharmerOrOwnerPlayerOrPlayerItself();