From 103125cfbd9daa44397ea3b731549c7822c4541a Mon Sep 17 00:00:00 2001 From: XTZGZoReX Date: Wed, 18 Mar 2009 21:18:45 +0100 Subject: * Do not output "Table `game_graveyard_zone` incomplete" for maps of type MAP_ARENA. These are not meant to have graveyards anyway. --HG-- branch : trunk --- src/game/ObjectMgr.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index ba6d78f637e..3abd08c07dc 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -4834,7 +4834,10 @@ WorldSafeLocsEntry const *ObjectMgr::GetClosestGraveYard(float x, float y, float // then check faction GraveYardMap::const_iterator graveLow = mGraveYardMap.lower_bound(zoneId); GraveYardMap::const_iterator graveUp = mGraveYardMap.upper_bound(zoneId); - if(graveLow==graveUp) + MapEntry const* map = sMapStore.LookupEntry(MapId); + // not need to check validity of map object; MapId _MUST_ be valid here + + if(graveLow==graveUp && !map->IsBattleArena()) { sLog.outErrorDb("Table `game_graveyard_zone` incomplete: Zone %u Team %u does not have a linked graveyard.",zoneId,team); return NULL; -- cgit v1.2.3