From 62d4d6cd0cd5128b5edaab2b841f0b6f23b4199a Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Thu, 3 Sep 2009 14:50:09 -0500
Subject: *Fix a crash caused by wintergrasp setup when a graveyard defined in
 db cannot be find by core.

--HG--
branch : trunk
---
 src/game/Wintergrasp.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src')

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)
-- 
cgit v1.2.3