From 46c314814c77ff154808e59ddcabf46f830d900c Mon Sep 17 00:00:00 2001 From: fgenesis Date: Thu, 23 Jul 2009 18:31:35 +0200 Subject: [PATCH] [8270] Fixed problem with Alt+F4 in instances. Signed-off-by: ApoC --- src/game/WorldSession.cpp | 7 +++++-- src/shared/revision_nr.h | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/game/WorldSession.cpp b/src/game/WorldSession.cpp index 798147fe8..5c8b44bc8 100644 --- a/src/game/WorldSession.cpp +++ b/src/game/WorldSession.cpp @@ -311,10 +311,13 @@ void WorldSession::LogoutPlayer(bool Save) _player->TeleportTo(_player->m_homebindMapId, _player->m_homebindX, _player->m_homebindY, _player->m_homebindZ, _player->GetOrientation()); //this is a bad place to call for far teleport because we need player to be in world for successful logout //maybe we should implement delayed far teleport logout? - while(_player->IsBeingTeleportedFar()) - HandleMoveWorldportAckOpcode(); } + // FG: finish pending transfers after starting the logout + // this should fix players beeing able to logout and login back with full hp at death position + while(_player->IsBeingTeleportedFar()) + HandleMoveWorldportAckOpcode(); + for (int i=0; i < PLAYER_MAX_BATTLEGROUND_QUEUES; ++i) { if(BattleGroundQueueTypeId bgQueueTypeId = _player->GetBattleGroundQueueTypeId(i)) diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 8c9363415..81f50ea49 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 "8269" + #define REVISION_NR "8270" #endif // __REVISION_NR_H__