aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorw12x <none@none>2008-12-26 14:55:16 +0100
committerw12x <none@none>2008-12-26 14:55:16 +0100
commitd9e8f38eff6a842f3397dec7eb16dd62ee8dc151 (patch)
tree2da68dd9223f09baa7c4f154b4bdf3a746d0f4e1
parent178ddecde69cb037667ecff8af87aba9e298f976 (diff)
Fixed a crash in OutdoorPvPObjective::UpdateActivePlayerProximityCheck caused by incrementing an already deleted iterator.
--HG-- branch : trunk
-rw-r--r--src/game/OutdoorPvP.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/game/OutdoorPvP.cpp b/src/game/OutdoorPvP.cpp
index f2310aa4e0c..06d56897f1e 100644
--- a/src/game/OutdoorPvP.cpp
+++ b/src/game/OutdoorPvP.cpp
@@ -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))
{