*Merge.

--HG--
branch : trunk

1 files changed, 3 insertions, 5 deletions

diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index 2a9d417079d..ef9c6cdb5a7 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -733,11 +733,9 @@ void Map::Update(const uint32 &t_diff)
             if(obj->isType(TYPEMASK_UNIT))
             {
                 if(!((Unit*)obj)->GetSharedVisionList().empty())
-                    for(SharedVisionList::const_iterator itr = ((Unit*)obj)->GetSharedVisionList().begin(); itr != ((Unit*)obj)->GetSharedVisionList().end();)
+                    for(SharedVisionList::const_iterator itr = ((Unit*)obj)->GetSharedVisionList().begin(); itr != ((Unit*)obj)->GetSharedVisionList().end(); ++itr)
                     {
-                        Player *player = *itr;
-                        ++itr;
-                        Trinity::PlayerRelocationNotifier notifier(*player);
+                        Trinity::PlayerVisibilityNotifier notifier(**itr);
                         VisitAll(obj->GetPositionX(), obj->GetPositionY(), World::GetMaxVisibleDistance(), notifier);
                         notifier.Notify();
                     }
@@ -747,7 +745,7 @@ void Map::Update(const uint32 &t_diff)
                 if(Unit *caster = ((DynamicObject*)obj)->GetCaster())
                     if(caster->GetTypeId() == TYPEID_PLAYER && caster->GetUInt64Value(PLAYER_FARSIGHT) == obj->GetGUID())
                     {
-                        Trinity::PlayerRelocationNotifier notifier(*((Player*)caster));
+                        Trinity::PlayerVisibilityNotifier notifier(*((Player*)caster));
                         VisitAll(obj->GetPositionX(), obj->GetPositionY(), World::GetMaxVisibleDistance(), notifier);
                         notifier.Notify();
                     }