*Fix a dead loop in 4786. By QAston.

--HG--
branch : trunk

1 files changed, 6 insertions, 0 deletions

diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 046332847a9..a49d6ac6d77 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -1623,11 +1623,17 @@ void Player::SendTeleportAckMsg()
 
 void Player::TeleportOutOfMap(Map *oldMap)
 {
+    while(IsBeingTeleportedFar())
+        GetSession()->HandleMoveWorldportAckOpcode();
+
     if(FindMap() != oldMap)
         return;
 
     TeleportTo(m_homebindMapId, m_homebindX, m_homebindY, m_homebindZ, GetOrientation());
 
+    while(IsBeingTeleportedFar())
+        GetSession()->HandleMoveWorldportAckOpcode();
+
     if(FindMap() == oldMap)
     {
         sLog.outCrash("Cannot teleport player out of map!");