*Merge.

--HG--
branch : trunk

1 files changed, 3 insertions, 15 deletions

diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index b82c4127d94..0d31be8aa98 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -451,6 +451,7 @@ bool Map::Add(Player *player)
 
     player->m_IsInNotifyList = false;
     player->m_Notified = false;
+    player->m_clientGUIDs.clear();
     AddNotifier(player);
 
     return true;
@@ -596,24 +597,12 @@ void Map::RelocationNotify()
     for(std::vector<uint64>::iterator iter = i_unitsToNotify.begin(); iter != i_unitsToNotify.end(); ++iter)
     {
         Unit *unit = ObjectAccessor::GetObjectInWorld(*iter, (Unit*)NULL);
-        if(!unit || unit->GetMapId() != GetId())
+        if(!unit || !unit->IsInWorld() || unit->GetMapId() != GetId())
         {
             *iter = 0;
             continue;
         }
 
-        if(!unit->IsInWorld())
-        {
-            //other objs are done during remove
-            if(unit->GetTypeId() == TYPEID_PLAYER)
-            {
-                Trinity::VisibleChangesNotifier notifier(*unit);
-                VisitWorld(unit->GetPositionX(), unit->GetPositionY(), World::GetMaxVisibleDistance(), notifier);
-            }
-            *iter = 0;
-            continue;
-        }
-
         unit->m_Notified = true;
 
         if(unit->GetTypeId() == TYPEID_PLAYER)
@@ -772,8 +761,6 @@ void Map::Update(const uint32 &t_diff)
 
 void Map::Remove(Player *player, bool remove)
 {
-    AddUnitToNotify(player);
-
     // 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
@@ -810,6 +797,7 @@ void Map::Remove(Player *player, bool remove)
     RemoveFromGrid(player,grid,cell);
 
     SendRemoveTransports(player);
+    UpdateObjectVisibility(player,cell,p);
 
     if( remove )
         DeleteFromWorld(player);