From f454ddf6d08503b36b3cb702804bfd0204407ba4 Mon Sep 17 00:00:00 2001 From: Triply Date: Mon, 2 Mar 2009 10:38:08 +0100 Subject: [PATCH] [7371] Correctly select closest graveyard in Player::RepoopAtGraveyard(). Patch provided by balrok Thx. Signed-off-by: Triply --- src/game/Player.cpp | 8 ++++---- src/shared/revision_nr.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 3bfd72f01..5c2dedb2e 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -4261,11 +4261,11 @@ void Player::RepopAtGraveyard() WorldSafeLocsEntry const *ClosestGrave = NULL; // Special handle for battleground maps - BattleGround *bg = sBattleGroundMgr.GetBattleGround(GetBattleGroundId(), m_bgTypeID); + if( GetBattleGroundTypeId() == BATTLEGROUND_AB || GetBattleGroundTypeId() == BATTLEGROUND_EY ) + if( BattleGround *bg = GetBattleGround() ) + ClosestGrave = bg->GetClosestGraveYard(GetPositionX(), GetPositionY(), GetPositionZ(), GetTeam()); - if(bg && (bg->GetTypeID() == BATTLEGROUND_AB || bg->GetTypeID() == BATTLEGROUND_EY)) - ClosestGrave = bg->GetClosestGraveYard(GetPositionX(), GetPositionY(), GetPositionZ(), GetTeam()); - else + if(!ClosestGrave) ClosestGrave = objmgr.GetClosestGraveYard( GetPositionX(), GetPositionY(), GetPositionZ(), GetMapId(), GetTeam() ); // stop countdown until repop diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index bd0712af7..43c6b8e0d 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "7370" + #define REVISION_NR "7371" #endif // __REVISION_NR_H__