server/mangos
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #62 from H0zen/develop21

Browse Source 
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
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/game/Object/ObjectMgr.cpp
View File

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