Instructions Jenkins Doxygen

[fixed] using the /waypoint command with NUMBER coordinates in the 62/5262/3
authorNee Shadowfire <nee@swgemu.com>
Fri, 17 Feb 2017 12:29:33 +0000 (12:29 +0000)
committerNee Shadowfire <nee@swgemu.com>
Fri, 17 Feb 2017 12:29:33 +0000 (12:29 +0000)
'argument' when also having something targetted should now yield the
proper intended actual entered waypoint

Change-Id: I67234b58ea4f0eadbbc5d356b7915f1962958e64

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

index 97d51e5..981052e 100644 (file)
@@ -60,14 +60,6 @@ public:
 
                ManagedReference<SceneObject*> targetObject = server->getZoneServer()->getObject(target).get();
 
-               if (targetObject != NULL) {
-                       Locker crosslocker(targetObject, creature);
-
-                       x = targetObject->getWorldPositionX();
-                       y = targetObject->getWorldPositionY();
-                       waypointName = targetObject->getDisplayedName();
-               }
-
                StringTokenizer tokenizer(waypointData);
                tokenizer.setDelimeter(" ");
 
@@ -152,6 +144,12 @@ public:
                                //A waypoint in the form of /waypoint <name>
                                waypointName = arg1;
                        }
+               } else if (targetObject != NULL) {
+                       Locker crosslocker(targetObject, creature);
+
+                       x = targetObject->getWorldPositionX();
+                       y = targetObject->getWorldPositionY();
+                       waypointName = targetObject->getDisplayedName();
                }
 
                x = (x < -8192) ? -8192 : x;