Merge pull request #3259 from Souler/pull

Traps and Basic Campfire ignoring unattackable flags.
This commit is contained in:
megamage
2011-10-08 13:36:05 -07:00
@@ -808,6 +808,9 @@ namespace Trinity
if (u->GetTypeId() == TYPEID_UNIT && ((Creature*)u)->isTotem()) if (u->GetTypeId() == TYPEID_UNIT && ((Creature*)u)->isTotem())
return false; return false;
if(!u->isTargetableForAttack(false))
return false;
return i_obj->IsWithinDistInMap(u, i_range) && !i_funit->IsFriendlyTo(u); return i_obj->IsWithinDistInMap(u, i_range) && !i_funit->IsFriendlyTo(u);
} }
private: private: