diff options
| -rw-r--r-- | sql/updates/world/2012_09_30_03_world_creature_text.sql (renamed from sql/updates/world/2012_XXX_XX_XX_world_creature_text.sql) | 0 | ||||
| -rwxr-xr-x | src/server/game/Entities/Player/Player.cpp | 4 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sql/updates/world/2012_XXX_XX_XX_world_creature_text.sql b/sql/updates/world/2012_09_30_03_world_creature_text.sql index a591f8cfb7c..a591f8cfb7c 100644 --- a/sql/updates/world/2012_XXX_XX_XX_world_creature_text.sql +++ b/sql/updates/world/2012_09_30_03_world_creature_text.sql diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 836ea09f727..d8a2694fc22 100755 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -5503,8 +5503,8 @@ void Player::RepopAtGraveyard() ClosestGrave = bg->GetClosestGraveYard(this); else { - if (sBattlefieldMgr->GetBattlefieldToZoneId(GetZoneId())) - ClosestGrave = sBattlefieldMgr->GetBattlefieldToZoneId(GetZoneId())->GetClosestGraveYard(this); + if (Battlefield* bf = sBattlefieldMgr->GetBattlefieldToZoneId(GetZoneId())) + ClosestGrave = bf->GetClosestGraveYard(this); else ClosestGrave = sObjectMgr->GetClosestGraveYard(GetPositionX(), GetPositionY(), GetPositionZ(), GetMapId(), GetTeam()); } |