diff options
| author | offl <11556157+offl@users.noreply.github.com> | 2021-07-30 10:36:38 +0300 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-03-11 21:20:04 +0100 |
| commit | 53d19b09f4de7c092747663ae7e1a01c0df553bf (patch) | |
| tree | 41efcfbadf26ec69e5ee4077b3514134a9176442 /src/server/game/Combat/CombatManager.cpp | |
| parent | 5afa32e9a7e944d5fbee620c31bf6e2939ec7c5d (diff) | |
Core/Creature: rename CREATURE_FLAG_EXTRA_IGNORE_COMBAT into CREATURE_FLAG_EXTRA_CANNOT_ENTER_COMBAT (#26762)
Co-authored-by: offl <offl@users.noreply.github.com>
(cherry picked from commit 06b554c36e8f196667e0a72820b37b9dc25bdde0)
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; |