*Merge. (lifebloom patch skipped)

--HG--
branch : trunk

1 files changed, 4 insertions, 2 deletions

diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index c8fdd973123..1fa040640bb 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -753,9 +753,11 @@ void Map::Update(const uint32 &t_diff)
             if(obj->isType(TYPEMASK_UNIT))
             {
                 if(!((Unit*)obj)->GetSharedVisionList().empty())
-                    for(SharedVisionList::const_iterator it = ((Unit*)obj)->GetSharedVisionList().begin(); it != ((Unit*)obj)->GetSharedVisionList().end(); ++it)
+                    for(SharedVisionList::const_iterator itr = ((Unit*)obj)->GetSharedVisionList().begin(); itr != ((Unit*)obj)->GetSharedVisionList().end();)
                     {
-                        Trinity::PlayerRelocationNotifier notifier(**it);
+                        Player *player = *itr;
+                        ++itr;
+                        Trinity::PlayerRelocationNotifier notifier(*player);
                         VisitAll(obj->GetPositionX(), obj->GetPositionY(), World::GetMaxVisibleDistance(), notifier);
                         notifier.Notify();
                     }