*Try to fix the crash caused by invalid map pointer of player.

--HG--
branch : trunk

1 files changed, 15 insertions, 0 deletions

diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 9964d69d051..046332847a9 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -1621,6 +1621,21 @@ void Player::SendTeleportAckMsg()
     GetSession()->SendPacket(&data);
 }
 
+void Player::TeleportOutOfMap(Map *oldMap)
+{
+    if(FindMap() != oldMap)
+        return;
+
+    TeleportTo(m_homebindMapId, m_homebindX, m_homebindY, m_homebindZ, GetOrientation());
+
+    if(FindMap() == oldMap)
+    {
+        sLog.outCrash("Cannot teleport player out of map!");
+        ResetMap();
+        assert(false);
+    }
+}
+
 bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientation, uint32 options)
 {
     if(!MapManager::IsValidMapCoord(mapid, x, y, z, orientation))