diff options
| author | Carbenium <carbenium@outlook.com> | 2015-06-02 14:40:11 +0200 |
|---|---|---|
| committer | Carbenium <carbenium@outlook.com> | 2015-06-02 14:40:11 +0200 |
| commit | 125d839a1878d3d3d0cbc193298f385560e268c9 (patch) | |
| tree | eeed716f86d04347110ac34fa76113e1abd1da31 | |
| parent | 833a0d2ea52009ea302fedda02882a3e9bd86286 (diff) | |
| parent | e7484151d5483ee478d4a293b8a7b6e37e4d26af (diff) | |
Merge pull request #14780 from mik1893/immune_to_npc_flag
Core/Creature: UNIT_FLAG_IMMUNE_TO_NPC check only vs non-player targets
| -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 7f00fc7f9d8..f7e32a25db7 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -1370,9 +1370,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; |