Instructions Jenkins Doxygen

[fixed] stability issue 93/1293/1
authorVictor Popovici <victorpopovici@gmail.com>
Tue, 24 Dec 2013 09:42:35 +0000 (10:42 +0100)
committerVictor Popovici <victorpopovici@gmail.com>
Tue, 24 Dec 2013 09:42:35 +0000 (10:42 +0100)
Change-Id: Ia8088289d1a73cbc769538b2ddae025619f1fc7a

MMOCoreORB/src/server/zone/objects/creature/commands/HealDamageCommand.h

index b604b06..b76d28e 100644 (file)
@@ -324,12 +324,15 @@ public:
                        return;
 
                try {
-                       zone->rlock();
+                       //zone->rlock();
 
-                       SortedVector<ManagedReference<QuadTreeEntry*> >* closeObjects = areaCenter->getCloseObjects();
+                       CloseObjectsVector* closeObjectsVector = (CloseObjectsVector*) areaCenter->getCloseObjects();
 
-                       for (int i = 0; i < closeObjects->size(); i++) {
-                               SceneObject* object = cast<SceneObject*>( closeObjects->get(i).get());
+                       SortedVector<ManagedReference<QuadTreeEntry*> > closeObjects;
+                       closeObjectsVector->safeCopyTo(closeObjects);
+
+                       for (int i = 0; i < closeObjects.size(); i++) {
+                               SceneObject* object = cast<SceneObject*>( closeObjects.get(i).get());
 
                                if (!object->isPlayerCreature() && !object->isPet())
                                        continue;
@@ -345,7 +348,7 @@ public:
                                if (creatureTarget->isAttackableBy(creature))
                                        continue;
 
-                               zone->runlock();
+                               //zone->runlock();
 
                                try {
 
@@ -359,13 +362,13 @@ public:
 
                                }
 
-                               zone->rlock();
+                               //zone->rlock();
 
                        }
 
-                       zone->runlock();
+                       //zone->runlock();
                } catch (Exception& e) {
-                       zone->runlock();
+                       //zone->runlock();
                }
        }