diff options
Diffstat (limited to 'src/server/game/Combat/CombatManager.cpp')
| -rw-r--r-- | src/server/game/Combat/CombatManager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Combat/CombatManager.cpp b/src/server/game/Combat/CombatManager.cpp index d0401ded76c..dbe9f33f6b4 100644 --- a/src/server/game/Combat/CombatManager.cpp +++ b/src/server/game/Combat/CombatManager.cpp @@ -43,8 +43,8 @@ return false; if (a->HasUnitState(UNIT_STATE_IN_FLIGHT) || b->HasUnitState(UNIT_STATE_IN_FLIGHT)) return false; - // ... both units must not be ignoring combat - if (a->IsIgnoringCombat() || b->IsIgnoringCombat()) + // ... both units must be allowed to enter combat + if (a->IsCombatDisallowed() || b->IsCombatDisallowed()) return false; if (a->IsFriendlyTo(b) || b->IsFriendlyTo(a)) return false; |