From d9e4d991c9664794fa76338cbaa14c740535323e Mon Sep 17 00:00:00 2001
From: megamage <none@none.none>
Date: Sat, 12 Nov 2011 08:16:52 -0500
Subject: [PATCH] Fix a crash when player is logged out when not in map.

---
 src/server/game/Maps/Map.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index d5b924e4a1..9c395a2319 100755
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -648,7 +648,10 @@ void Map::RemovePlayerFromMap(Player* player, bool remove)
     SendRemoveTransports(player);
 
     player->UpdateObjectVisibility(true);
-    player->RemoveFromGrid();
+    if (player->IsInGrid())
+        player->RemoveFromGrid();
+    else
+        ASSERT(remove); //maybe deleted in logoutplayer when player is not in a map
 
     if (remove)
         DeleteFromWorld(player);