From 4ecbefabfa43893e2411fd0cbb40767e7a74f758 Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Mon, 10 Aug 2009 23:28:50 -0500
Subject: *Fix a crash when player gets teleported during log out.

--HG--
branch : trunk
---
 src/game/Player.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/game')

diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 8a3a4bffd93..a56dba641db 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -1844,11 +1844,11 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
                 }
                 GetSession()->SendPacket( &data );
                 SendSavedInstances();
-
-                // remove from old map now
-                if(oldmap) oldmap->Remove(this, false);
             }
 
+            // remove from old map now
+            if(oldmap) oldmap->Remove(this, false);
+
             // new final coordinates
             float final_x = x;
             float final_y = y;
-- 
cgit v1.2.3