aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Handlers/MiscHandler.cpp
diff options
context:
space:
mode:
authorMitchesD <majklprofik@seznam.cz>2014-10-12 21:36:46 +0200
committerMitchesD <majklprofik@seznam.cz>2014-10-12 21:36:46 +0200
commita96ff6043d62ba7afd4689c922e6fee734afc415 (patch)
tree0817a4fbe1f95cab50970b4b8ec742d4aa4994c1 /src/server/game/Handlers/MiscHandler.cpp
parent9922063021c6d49798c42c3dcbb6c9572fbe19c9 (diff)
parent68293aa9b21877d62d2085bca32e43686e5ede4d (diff)
Merge pull request #13321 from Kittnz/unit_state
Core/Misc: Fix current player state when logging out
Diffstat (limited to 'src/server/game/Handlers/MiscHandler.cpp')
-rw-r--r--src/server/game/Handlers/MiscHandler.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp
index bede3b4323c..50fde106824 100644
--- a/src/server/game/Handlers/MiscHandler.cpp
+++ b/src/server/game/Handlers/MiscHandler.cpp
@@ -414,7 +414,8 @@ void WorldSession::HandleLogoutRequestOpcode(WorldPacket& /*recvData*/)
// 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);
+ if (GetPlayer()->getStandState() == UNIT_STAND_STATE_STAND)
+ GetPlayer()->SetStandState(UNIT_STAND_STATE_SIT);
WorldPacket data(SMSG_FORCE_MOVE_ROOT, (8+4)); // guess size
data << GetPlayer()->GetPackGUID();