From 43a0e595ea014e40042cf503dd924ef7133b9464 Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Mon, 15 Mar 2010 23:15:50 +0300 Subject: [PATCH] [9591] Fixed rest state remove at leave tavern --- src/game/Player.cpp | 6 +++--- src/shared/revision_nr.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 34d05ccd8..bffd85eff 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -6483,11 +6483,11 @@ void Player::UpdateZone(uint32 newZone, uint32 newArea) } else // anywhere else { - if(HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING)) // but resting (walk from city or maybe in tavern or leave tavern recently) + if (HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING)) // but resting (walk from city or maybe in tavern or leave tavern recently) { - if(GetRestType()==REST_TYPE_IN_TAVERN) // has been in tavern. Is still in? + if (GetRestType()==REST_TYPE_IN_TAVERN) // has been in tavern. Is still in? { - if(GetMapId()!=GetInnPosMapId() || sqrt((GetPositionX()-GetInnPosX())*(GetPositionX()-GetInnPosX())+(GetPositionY()-GetInnPosY())*(GetPositionY()-GetInnPosY())+(GetPositionZ()-GetInnPosZ())*(GetPositionZ()-GetInnPosZ()))>40) + if (GetMapId()!=GetInnPosMapId() || ((GetPositionX()-GetInnPosX())*(GetPositionX()-GetInnPosX())+(GetPositionY()-GetInnPosY())*(GetPositionY()-GetInnPosY())+(GetPositionZ()-GetInnPosZ())*(GetPositionZ()-GetInnPosZ())) > 30*30) { RemoveFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING); SetRestType(REST_TYPE_NO); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 38651320e..72ddc8f35 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 "9590" + #define REVISION_NR "9591" #endif // __REVISION_NR_H__