Changeset 3160

Timestamp:

02/08/2010 03:37:43 PM (7 months ago)

Author:

jackpoz

Message:

FIXED: Raid leaders received a "You left the group" message when inviting someone in the raid, even if they were still in the raid.
FIXED: Crash added in r3158.

Location:

trunk/src/arcemu-world

Files:

• GroupHandler.cpp (modified) (1 diff)
• MapCell.cpp (modified) (3 diffs)
• MapCell.h (modified) (1 diff)

trunk/src/arcemu-world/GroupHandler.cpp

@@ -105 +105 @@
         player->GetSession()->SendPacket(&data);
 
-        uint32 gtype = 0;
-        if(group)
-                gtype = group->GetGroupType();
-
-        SendPartyCommandResult(_player, gtype, membername, ERR_PARTY_NO_ERROR);
+        SendPartyCommandResult(_player, 0, membername, ERR_PARTY_NO_ERROR);
 
         // 16/08/06 - change to guid to prevent very unlikely event of a crash in deny, etc

trunk/src/arcemu-world/MapCell.cpp

@@ -41 +41 @@
         _unloadpending=false;
         _objects.clear();
+        objects_iterator = _objects.begin();
 }
 
@@ -55 +56 @@
         if(obj->IsPlayer())
                 --_playerCount;
+
+        if(objects_iterator != _objects.end() && (*objects_iterator) == obj)  
+                ++objects_iterator;
 
         _objects.erase(obj);
@@ -129 +133 @@
 
         //This time it's simpler! We just remove everything :)
-        for(itr = _objects.begin(); itr != _objects.end(); )
+        for(objects_iterator = _objects.begin(); objects_iterator != _objects.end(); )
         {
                 count++;
 
-                Object *obj = (*itr);
-
-                itr++;
+                Object *obj = (*objects_iterator);
+
+                objects_iterator++;
 
                 //zack : we actually never set this to null. Useless check for lucky memory corruption hit.

trunk/src/arcemu-world/MapCell.h

@@ -73 +73 @@
 
         ObjectSet _respawnObjects;
+        ObjectSet::iterator objects_iterator;//required by MapCell::RemoveObjects() removing Creatures which will remove their guardians and corrupt itr.
 
 private: