diff options
| author | Carbenium <carbenium@outlook.com> | 2015-06-02 14:40:11 +0200 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2015-06-26 02:59:41 +0100 |
| commit | 4a9bbbda14b0e4a65d25aea18946e115c48a0c86 (patch) | |
| tree | c34e467a4547e290f22ea8e7b59f6b7942b8f0fa | |
| parent | edc2476e84fba6e2696c93001e19a5eae7714a3c (diff) | |
Merge pull request #14780 from mik1893/immune_to_npc_flag
Core/Creature: UNIT_FLAG_IMMUNE_TO_NPC check only vs non-player targets
(cherry picked from commit 125d839a1878d3d3d0cbc193298f385560e268c9)
| -rw-r--r-- | src/server/game/Entities/Creature/Creature.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 3e2f1874147..a9f91ede933 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -1407,9 +1407,6 @@ bool Creature::CanStartAttack(Unit const* who, bool force) const if (IsCivilian()) return false; - if (HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_NPC)) - return false; - // Do not attack non-combat pets if (who->GetTypeId() == TYPEID_UNIT && who->GetCreatureType() == CREATURE_TYPE_NON_COMBAT_PET) return false; |