From afccf652ac900403a4580fadc3cc0dfac0f4a2f2 Mon Sep 17 00:00:00 2001
From: Obique <obique.pswg@gmail.com>
Date: Sat, 1 Sep 2018 19:13:38 -0500
Subject: [PATCH] Fixed compile errors and QA tool recover

---
 .../global/commands/callbacks/admin/qatool/CmdQaTool.java | 2 +-
 .../holocore/resources/support/objects/swg/SWGObject.java | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/projectswg/holocore/resources/support/global/commands/callbacks/admin/qatool/CmdQaTool.java b/src/main/java/com/projectswg/holocore/resources/support/global/commands/callbacks/admin/qatool/CmdQaTool.java
index 560ce5296..d68cd9706 100644
--- a/src/main/java/com/projectswg/holocore/resources/support/global/commands/callbacks/admin/qatool/CmdQaTool.java
+++ b/src/main/java/com/projectswg/holocore/resources/support/global/commands/callbacks/admin/qatool/CmdQaTool.java
@@ -158,7 +158,7 @@ public class CmdQaTool implements ICmdCallback {
 		}
 		
 		Location loc = new Location(3525, 4, -4807, Terrain.TATOOINE);
-		recoveree.moveToLocation(loc);
+		recoveree.moveToContainer(null, loc);
 		SystemMessageIntent.broadcastPersonal(player, "Sucessfully teleported " + recoveree.getObjectName() + " to " + loc.getPosition());
 	}
 	
diff --git a/src/main/java/com/projectswg/holocore/resources/support/objects/swg/SWGObject.java b/src/main/java/com/projectswg/holocore/resources/support/objects/swg/SWGObject.java
index 6d075ac7a..6bece9c9d 100644
--- a/src/main/java/com/projectswg/holocore/resources/support/objects/swg/SWGObject.java
+++ b/src/main/java/com/projectswg/holocore/resources/support/objects/swg/SWGObject.java
@@ -266,6 +266,14 @@ public abstract class SWGObject extends BaselineObject implements Comparable<SWG
 		moveToContainer(newParent, Location.builder(getLocation()).setPosition(x, y, z).build());
 	}
 	
+	/**
+	 * Attempts to move this object to the specified location within the current parent
+	 * @param location the location to move this object to
+	 */
+	public void moveToLocation(@NotNull Location location) {
+		moveToContainer(parent, location);
+	}
+	
 	/**
 	 * Moves this object to the passed container if the requester has the MOVE permission for the container
 	 *