*Fix a crash caused by wintergrasp setup when a graveyard defined in db cannot be find by core.

--HG--
branch : trunk

1 files changed, 6 insertions, 0 deletions

diff --git a/src/game/Wintergrasp.cpp b/src/game/Wintergrasp.cpp
index e53a4b0b76f..35602251715 100644
--- a/src/game/Wintergrasp.cpp
+++ b/src/game/Wintergrasp.cpp
@@ -246,6 +246,12 @@ bool OPvPWintergrasp::SetupOutdoorPvP()
         {
             // find or create grave yard
             const WorldSafeLocsEntry *loc = objmgr.GetClosestGraveYard((*itr)->x, (*itr)->y, (*itr)->z, (*itr)->mapId, 0);
+            if(!loc)
+            {
+                ++itr;
+                continue;
+            }
+
             GraveYardMap::const_iterator graveItr;
             for(graveItr = graveLow; graveItr != graveUp; ++graveItr)
                 if(graveItr->second.safeLocId == loc->ID)