Instructions Jenkins Doxygen

[fixed] stability issue 32/1432/1
authorVictor Popovici <theanswer@swgemu.com>
Thu, 27 Feb 2014 15:19:03 +0000 (16:19 +0100)
committerVictor Popovici <theanswer@swgemu.com>
Thu, 27 Feb 2014 15:19:03 +0000 (16:19 +0100)
Change-Id: I35ef35f04e8e1a26ae3d4d41bb5bc5a6f28e331c

MMOCoreORB/src/server/zone/objects/scene/components/ZoneComponent.cpp

index 27311cc..bee5643 100644 (file)
@@ -186,9 +186,14 @@ void ZoneComponent::updateInRangeObjectsOnMount(SceneObject* sceneObject) {
 void ZoneComponent::updateZone(SceneObject* sceneObject, bool lightUpdate, bool sendPackets) {
        ManagedReference<SceneObject*> parent = sceneObject->getParent();
        Zone* zone = sceneObject->getZone();
+       ManagedReference<SceneObject*> sceneObjectRootParent = sceneObject->getRootParent();
 
-       if (zone == NULL)
-               zone = parent->getRootParent().get()->getZone();
+       if (zone == NULL) {
+               if (sceneObjectRootParent == NULL)
+                       return;
+
+               zone = sceneObjectRootParent->getZone();
+       }
 
        if (parent != NULL && (parent->isVehicleObject() || parent->isMount()))
                sceneObject->updateVehiclePosition(sendPackets);