Instructions Jenkins Doxygen

[fixed] stability issue 33/1533/2
authorVictor Popovici <theanswer@swgemu.com>
Sun, 6 Apr 2014 09:37:21 +0000 (11:37 +0200)
committerVictor Popovici <theanswer@swgemu.com>
Sun, 6 Apr 2014 09:37:21 +0000 (11:37 +0200)
Change-Id: I123296d4067b8b956537bd6e87cd9a8666156bf2

MMOCoreORB/src/server/zone/objects/player/sui/callbacks/FindObjectSuiCallback.h

index eafcdb4..e5254af 100644 (file)
@@ -37,6 +37,8 @@ public:
                if (object == NULL)
                        return;
 
+               Zone* zone = object->getZone();
+
                if(otherPressed) {
                        StringBuffer arguments;
 
@@ -44,12 +46,19 @@ public:
 
                        if (object->getParent().get() != NULL) {
                                arguments << String::valueOf(object->getPositionX()) << " " << String::valueOf(object->getPositionY());
-                               arguments << " " << object->getZone()->getZoneName();
+
+                               if (zone) {
+                                       arguments << " " << zone->getZoneName();
+                               }
+
                                arguments << " " << String::valueOf(object->getPositionZ());
                                arguments << " " << String::valueOf(object->getParentID());
                        } else {
                                arguments << String::valueOf(object->getWorldPositionX()) << " " << String::valueOf(object->getWorldPositionY());
-                               arguments << " " << object->getZone()->getZoneName();
+
+                               if (zone) {
+                                       arguments << " " << zone->getZoneName();
+                               }
                        }
 
                        ManagedReference<ObjectController*> objectController = server->getObjectController();