1 files changed, 5 insertions, 9 deletions
diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index d9971518bf3..7bf4c3fa83e 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -797,6 +797,10 @@ void Map::Update(const uint32 &t_diff)
 
 void Map::Remove(Player *player, bool remove)
 {
+    player->DestroyForNearbyPlayers();
+    player->m_IsInNotifyList = false;
+    player->m_Notified = false;
+
     // this may be called during Map::Update
     // after decrement+unlink, ++m_mapRefIter will continue correctly
     // when the first element of the list is being removed
@@ -835,7 +839,7 @@ void Map::Remove(Player *player, bool remove)
     SendRemoveTransports(player);
 
     //UpdateObjectsVisibilityFor(player,cell,p);
-    AddUnitToNotify(player);
+    //AddUnitToNotify(player);
 
     if( remove )
         DeleteFromWorld(player);
@@ -1638,14 +1642,6 @@ void Map::RemoveAllObjectsInRemoveList()
     //sLog.outDebug("Object remover 2 check.");
 }
 
-bool Map::CanUnload(const uint32 &diff)
-{
-    if(!m_unloadTimer) return false;
-    if(m_unloadTimer < diff) return true;
-    m_unloadTimer -= diff;
-    return false;
-}
-
 uint32 Map::GetPlayersCountExceptGMs() const
 {
     uint32 count = 0;