*Merge

--HG-- branch : trunk
2008-12-26 17:06:43 +01:00
parent fcba716f40 d9e8f38eff
commit 9cd608739d
1 changed files with 4 additions and 1 deletions
@@ -446,8 +446,11 @@ void OutdoorPvPObjective::UpdateActivePlayerProximityCheck()
    {
        for(int team = 0; team < 2; ++team)
        {
-            for(std::set<uint64>::iterator itr = m_ActivePlayerGuids[team].begin(); itr != m_ActivePlayerGuids[team].end(); ++ itr)
+            std::set<uint64>::iterator itr, next;
+            for(itr = m_ActivePlayerGuids[team].begin(); itr != m_ActivePlayerGuids[team].end(); itr = next)
            {
+                next = itr;
+                ++next;
                // if the player is online
                if(Player * pl = objmgr.GetPlayer(*itr))
                {