Instructions Jenkins Doxygen

[fixed] stability issue 31/1631/1
authorVictor Popovici <theanswer@swgemu.com>
Thu, 1 May 2014 19:20:10 +0000 (21:20 +0200)
committerVictor Popovici <theanswer@swgemu.com>
Thu, 1 May 2014 19:20:10 +0000 (21:20 +0200)
Change-Id: Icd9eb04ba28933804bec863a7e246e23ed918677

MMOCoreORB/src/server/zone/ZoneContainerComponent.cpp

index 3003fc6..6fc5745 100644 (file)
@@ -238,14 +238,14 @@ bool ZoneContainerComponent::removeObject(SceneObject* sceneObject, SceneObject*
 
                if (closeObjects != NULL) {
                        try {
-                       while (closeObjects->size() > 0) {
-                               ManagedReference<QuadTreeEntry*> obj = closeObjects->get(0);
+                               while (closeObjects->size() > 0) {
+                                       ManagedReference<QuadTreeEntry*> obj = closeObjects->get(0);
 
-                               if (obj != object && obj->getCloseObjects() != NULL)
-                                       obj->removeInRangeObject(object);
+                                       if (obj != NULL && obj != object && obj->getCloseObjects() != NULL)
+                                               obj->removeInRangeObject(object);
 
-                               object->removeInRangeObject((int) 0);
-                       }
+                                       object->removeInRangeObject((int) 0);
+                               }
                        } catch (...) {
                        }
                } else {
@@ -256,7 +256,7 @@ bool ZoneContainerComponent::removeObject(SceneObject* sceneObject, SceneObject*
                        for (int i = 0; i < closeSceneObjects.size(); ++i) {
                                QuadTreeEntry* obj = closeSceneObjects.get(i);
 
-                               if (obj != object && obj->getCloseObjects() != NULL)
+                               if (obj != NULL && obj != object && obj->getCloseObjects() != NULL)
                                        obj->removeInRangeObject(object);
                        }
                }