Core/Units: add new functionality for units to block or enable combat interactions
Port From (https://github.com/TrinityCore/TrinityCore/commit/2819951dce545438724719836e3a13d3039b8690)
This commit is contained in:
@@ -57,11 +57,8 @@ namespace Game.Combat
|
||||
return false;
|
||||
if (a.HasUnitState(UnitState.InFlight) || b.HasUnitState(UnitState.InFlight))
|
||||
return false;
|
||||
Creature aCreature = a.ToCreature();
|
||||
if (aCreature != null && aCreature.IsCombatDisallowed())
|
||||
return false;
|
||||
Creature bCreature = b.ToCreature();
|
||||
if (bCreature != null && bCreature.IsCombatDisallowed())
|
||||
// ... both units must not be ignoring combat
|
||||
if (a.IsIgnoringCombat() || b.IsIgnoringCombat())
|
||||
return false;
|
||||
if (a.IsFriendlyTo(b) || b.IsFriendlyTo(a))
|
||||
return false;
|
||||
|
||||
Reference in New Issue
Block a user