*Fix traps. Thanks to megamage for help.

--HG--
branch : trunk

1 files changed, 5 insertions, 1 deletions

diff --git a/src/game/GridNotifiers.h b/src/game/GridNotifiers.h
index 8e427366f1a..ba487dec55f 100644
--- a/src/game/GridNotifiers.h
+++ b/src/game/GridNotifiers.h
@@ -600,8 +600,12 @@ namespace Trinity
             AnyUnfriendlyNoTotemUnitInObjectRangeCheck(WorldObject const* obj, Unit const* funit, float range) : i_obj(obj), i_funit(funit), i_range(range) {}
             bool operator()(Unit* u)
             {
-                if(u->isAlive() && i_obj->IsWithinDistInMap(u, i_range) && !i_funit->IsFriendlyTo(u) && !((Creature*)u)->isTotem())
+                if(u->isAlive() && i_obj->IsWithinDistInMap(u, i_range) && !i_funit->IsFriendlyTo(u))
+                {
+                    if (u->GetTypeId()==TYPEID_UNIT && !((Creature*)u)->isTotem())
+                        return false;
                     return true;
+                }
                 else
                     return false;
             }