diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-08-27 22:43:07 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-08-27 22:43:07 +0100 |
| commit | e09591b8a7f06ae25eda7544d8555ca9a7e79960 (patch) | |
| tree | c3dcd1f4f26a5c27c54f198764f6ae55f52b28a1 /src/server/game/Entities | |
| parent | 353ebad6b91ee97469bd0ff0aaebadf3b8f28183 (diff) | |
| parent | c4f011f3324bc90631472bf2aa1b89590742909a (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
Diffstat (limited to 'src/server/game/Entities')
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index e20956879b3..b79ecff7f96 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -7665,8 +7665,7 @@ void Player::UpdateZone(uint32 newZone, uint32 newArea) if (GetRestType() == REST_TYPE_IN_TAVERN) // Still inside a tavern or has recently left { // Remove rest state if we have recently left a tavern. - // Why is 40 yd hardcoded? - if (GetMapId() != GetInnPosMapId() || GetExactDist(GetInnPosX(), GetInnPosY(), GetInnPosZ()) > 40.0f) + if (GetMapId() != GetInnPosMapId() || GetExactDist(GetInnPosX(), GetInnPosY(), GetInnPosZ()) > 1.0f) { RemoveFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING); SetRestType(REST_TYPE_NO); |