From 5f6705535b9ef5d37521a9078e7dea84a303ebe2 Mon Sep 17 00:00:00 2001 From: QAston Date: Fri, 13 Feb 2009 20:16:38 +0100 Subject: *Fix bug that traps were activated by totems. --HG-- branch : trunk --- src/game/GameObject.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/game/GameObject.cpp') diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp index b7487568e62..82102a99444 100644 --- a/src/game/GameObject.cpp +++ b/src/game/GameObject.cpp @@ -309,18 +309,18 @@ void GameObject::Update(uint32 /*p_time*/) // search unfriendly creature if(owner && NeedDespawn) // hunter trap { - Trinity::AnyUnfriendlyUnitInObjectRangeCheck u_check(this, owner, radius); - Trinity::UnitSearcher checker(ok, u_check); + Trinity::AnyUnfriendlyNoTotemUnitInObjectRangeCheck u_check(this, owner, radius); + Trinity::UnitSearcher checker(ok, u_check); CellLock cell_lock(cell, p); - TypeContainerVisitor, GridTypeMapContainer > grid_object_checker(checker); + TypeContainerVisitor, GridTypeMapContainer > grid_object_checker(checker); cell_lock->Visit(cell_lock, grid_object_checker, *MapManager::Instance().GetMap(GetMapId(), this)); // or unfriendly player/pet if(!ok) { - TypeContainerVisitor, WorldTypeMapContainer > world_object_checker(checker); + TypeContainerVisitor, WorldTypeMapContainer > world_object_checker(checker); cell_lock->Visit(cell_lock, world_object_checker, *MapManager::Instance().GetMap(GetMapId(), this)); } } -- cgit v1.2.3