diff --git a/src/game/Object/ObjectMgr.cpp b/src/game/Object/ObjectMgr.cpp index a8b0c1c1..fa1f8ef0 100644 --- a/src/game/Object/ObjectMgr.cpp +++ b/src/game/Object/ObjectMgr.cpp @@ -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 searcher(pGo, go_check); - - Cell::VisitGridObjects(source, searcher, m_value2); + if (source) + { + MaNGOS::NearestGameObjectEntryInObjectRangeCheck go_check(*source, m_value1, m_value2); + MaNGOS::GameObjectLastSearcher searcher(pGo, go_check); + Cell::VisitGridObjects(source, searcher, m_value2); + } return pGo; } default: