Merge commit '61ba5e4f34211c2f0f286e70d8ace37714ca3c56' into 4.3.4

Conflicts:
	sql/updates/world/2015_02_23_00_world.sql
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Achievements/AchievementMgr.h
This commit is contained in:
Carbenium committed 2015-07-21 22:47:41 +02:00
commit 2bdcce17f8
11 files changed
+571 -57

No files matched your search

@@ -2425,6 +2425,13 @@ void WorldObject::GetCreatureListWithEntryInGrid(std::list<Creature*>& creatureL
cell.Visit(pair, visitor, *(this->GetMap()), *this, maxSearchRange);
}
void WorldObject::GetPlayerListInGrid(std::list<Player*>& playerList, float maxSearchRange) const
{
Trinity::AnyPlayerInObjectRangeCheck checker(this, maxSearchRange);
Trinity::PlayerListSearcher<Trinity::AnyPlayerInObjectRangeCheck> searcher(this, playerList, checker);
this->VisitNearbyWorldObject(maxSearchRange, searcher);
}
/*
namespace Trinity
{