From e3463dca0d84047599d9d38a8cdbdb36e99e704a Mon Sep 17 00:00:00 2001 From: Den Date: Sun, 29 May 2011 05:21:07 +0400 Subject: [PATCH] [11559] Not command character to sitdown at logout request when unexpected. This fix swiming/form flight cases animation in logout request. Signed-off-by: VladimirMangos --- src/game/MiscHandler.cpp | 4 +++- src/shared/revision_nr.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/game/MiscHandler.cpp b/src/game/MiscHandler.cpp index 260be7e0b..380b8a68b 100644 --- a/src/game/MiscHandler.cpp +++ b/src/game/MiscHandler.cpp @@ -292,7 +292,9 @@ void WorldSession::HandleLogoutRequestOpcode( WorldPacket & /*recv_data*/ ) // not set flags if player can't free move to prevent lost state at logout cancel if(GetPlayer()->CanFreeMove()) { - GetPlayer()->SetStandState(UNIT_STAND_STATE_SIT); + float height = GetPlayer()->GetTerrain()->GetHeight(GetPlayer()->GetPositionX(), GetPlayer()->GetPositionY(), GetPlayer()->GetPositionZ()); + if ((GetPlayer()->GetPositionZ() < height + 0.1f) && !(GetPlayer()->IsInWater())) + GetPlayer()->SetStandState(UNIT_STAND_STATE_SIT); WorldPacket data( SMSG_FORCE_MOVE_ROOT, (8+4) ); // guess size data << GetPlayer()->GetPackGUID(); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 896751c5c..dc068027b 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 "11558" + #define REVISION_NR "11559" #endif // __REVISION_NR_H__