aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormegamage <none@none.none>2011-10-08 13:36:05 -0700
committermegamage <none@none.none>2011-10-08 13:36:05 -0700
commitf9fc12650b8956b9530c2177a7fc2159ba949b78 (patch)
treefea883156f0665e59f1956b240318739da732029 /src
parent45de1f01e014f4f473ccd7a4e8d54d61183da1d0 (diff)
parent0f9fc672d55435fdc8b7e32c21423e1ec2cbe605 (diff)
Merge pull request #3259 from Souler/pull
Traps and Basic Campfire ignoring unattackable flags.
Diffstat (limited to 'src')
-rwxr-xr-xsrc/server/game/Grids/Notifiers/GridNotifiers.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.h b/src/server/game/Grids/Notifiers/GridNotifiers.h
index a5bce96f653..0cd15143cee 100755
--- a/src/server/game/Grids/Notifiers/GridNotifiers.h
+++ b/src/server/game/Grids/Notifiers/GridNotifiers.h
@@ -808,6 +808,9 @@ namespace Trinity
if (u->GetTypeId() == TYPEID_UNIT && ((Creature*)u)->isTotem())
return false;
+ if(!u->isTargetableForAttack(false))
+ return false;
+
return i_obj->IsWithinDistInMap(u, i_range) && !i_funit->IsFriendlyTo(u);
}
private: