From 4a9bbbda14b0e4a65d25aea18946e115c48a0c86 Mon Sep 17 00:00:00 2001 From: Carbenium Date: Tue, 2 Jun 2015 14:40:11 +0200 Subject: 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) --- src/server/game/Entities/Creature/Creature.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'src') 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; -- cgit v1.2.3