*Fix a dead loop in 4786. By QAston.

--HG-- branch : trunk
2009-08-06 11:01:22 -05:00
parent e8330e4162
commit 05940192f4
1 changed files with 6 additions and 0 deletions
@@ -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!");