(cherry picked from commit 9299e9bde0)
This commit is contained in:
Shauren
2017-05-13 19:37:33 +02:00
committed by ariel-
parent 7874bee7bf
commit d6201e5dbb
57 changed files with 236 additions and 404 deletions

View File

@@ -929,7 +929,7 @@ public:
Creature* passenger = NULL;
Trinity::AllCreaturesOfEntryInRange check(handler->GetSession()->GetPlayer(), entry, 20.0f);
Trinity::CreatureSearcher<Trinity::AllCreaturesOfEntryInRange> searcher(handler->GetSession()->GetPlayer(), passenger, check);
handler->GetSession()->GetPlayer()->VisitNearbyObject(30.0f, searcher);
Cell::VisitAllObjects(handler->GetSession()->GetPlayer(), searcher, 30.0f);
if (!passenger || passenger == target)
return false;
passenger->EnterVehicle(target, seatId);

View File

@@ -1896,7 +1896,7 @@ public:
Trinity::RespawnDo u_do;
Trinity::WorldObjectWorker<Trinity::RespawnDo> worker(player, u_do);
player->VisitNearbyGridObject(player->GetGridActivationRange(), worker);
Cell::VisitGridObjects(player, worker, player->GetGridActivationRange());
return true;
}

View File

@@ -261,18 +261,11 @@ public:
float radius = 40.0f;
WorldObject* object = handler->GetSession()->GetPlayer();
CellCoord pair(Trinity::ComputeCellCoord(object->GetPositionX(), object->GetPositionY()));
Cell cell(pair);
cell.SetNoCreate();
// Get Creatures
std::list<Creature*> creatureList;
Trinity::AnyUnitInObjectRangeCheck go_check(object, radius);
Trinity::CreatureListSearcher<Trinity::AnyUnitInObjectRangeCheck> go_search(object, creatureList, go_check);
TypeContainerVisitor<Trinity::CreatureListSearcher<Trinity::AnyUnitInObjectRangeCheck>, GridTypeMapContainer> go_visit(go_search);
// Get Creatures
cell.Visit(pair, go_visit, *(object->GetMap()), *object, radius);
Cell::VisitGridObjects(object, go_search, radius);
if (!creatureList.empty())
{