Merge pull request #62 from H0zen/develop21

Fix server crash on CONDITION_GAMEOBJECT_IN_RANGE check.
This commit is contained in:
Antz 2016-01-09 22:56:10 +00:00
commit edd028cb36

View File

@ -7159,11 +7159,13 @@ bool PlayerCondition::Meets(Player const* player, Map const* map, WorldObject co
{
GameObject* pGo = NULL;
MaNGOS::NearestGameObjectEntryInObjectRangeCheck go_check(*source, m_value1, m_value2);
MaNGOS::GameObjectLastSearcher<MaNGOS::NearestGameObjectEntryInObjectRangeCheck> searcher(pGo, go_check);
Cell::VisitGridObjects(source, searcher, m_value2);
if (source)
{
MaNGOS::NearestGameObjectEntryInObjectRangeCheck go_check(*source, m_value1, m_value2);
MaNGOS::GameObjectLastSearcher<MaNGOS::NearestGameObjectEntryInObjectRangeCheck> searcher(pGo, go_check);
Cell::VisitGridObjects(source, searcher, m_value2);
}
return pGo;
}
default: