From 28ee9a7c39e7e34b223f7a9787625b9650a4ad58 Mon Sep 17 00:00:00 2001 From: arrai Date: Mon, 29 Dec 2008 14:37:36 +0100 Subject: [PATCH] [6972] Fixed teleporting players home at logging out in invalid instances --- src/game/WorldSession.cpp | 4 ++++ src/shared/revision_nr.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/game/WorldSession.cpp b/src/game/WorldSession.cpp index 858f33717..89dcfbb56 100644 --- a/src/game/WorldSession.cpp +++ b/src/game/WorldSession.cpp @@ -307,6 +307,10 @@ void WorldSession::LogoutPlayer(bool Save) if(_player->InBattleGround()) _player->LeaveBattleground(); + ///- Teleport to home if the player is in an invalid instance + if(!_player->m_InstanceValid && !_player->isGameMaster()) + _player->TeleportTo(_player->m_homebindMapId, _player->m_homebindX, _player->m_homebindY, _player->m_homebindZ, _player->GetOrientation()); + for (int i=0; i < PLAYER_MAX_BATTLEGROUND_QUEUES; i++) { if(int32 bgTypeId = _player->GetBattleGroundQueueId(i)) diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 3926b14bc..a22d0da1a 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 "6971" + #define REVISION_NR "6972" #endif // __REVISION_NR_H__