From 0905538b3234b760e8e99250939cec19042e7a14 Mon Sep 17 00:00:00 2001 From: Shocker Date: Sat, 9 Apr 2011 11:28:39 +0300 Subject: [PATCH] Core/Misc: Fix possible endless loop in HandleMoveWorldportAckOpcode / Logout --- src/server/game/Server/Protocol/Handlers/MovementHandler.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp b/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp index 671f7541cf7..df7b8e5eee3 100755 --- a/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp @@ -43,6 +43,8 @@ void WorldSession::HandleMoveWorldportAckOpcode() if (!GetPlayer()->IsBeingTeleportedFar()) return; + GetPlayer()->SetSemaphoreTeleportFar(false); + // get the teleport destination WorldLocation &loc = GetPlayer()->GetTeleportDest(); @@ -61,8 +63,6 @@ void WorldSession::HandleMoveWorldportAckOpcode() if (GetPlayer()->m_InstanceValid == false && !mInstance) GetPlayer()->m_InstanceValid = true; - GetPlayer()->SetSemaphoreTeleportFar(false); - Map * oldMap = GetPlayer()->GetMap(); ASSERT(oldMap); if (GetPlayer()->IsInWorld())