From 91c488e75784df0bc4e0ee7879b1dfd390ed5d44 Mon Sep 17 00:00:00 2001
From: Obique PSWG <obique.pswg@gmail.com>
Date: Thu, 15 Jun 2017 00:04:24 -0500
Subject: [PATCH] Removed unnecessary optimization

---
 .../objects/awareness/AwarenessHandler.java   | 26 -------------------
 src/services/objects/ObjectAwareness.java     |  6 +----
 .../awareness/TestAwarenessHandler.java       |  2 +-
 3 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/src/resources/objects/awareness/AwarenessHandler.java b/src/resources/objects/awareness/AwarenessHandler.java
index d763a74cd..763374c91 100644
--- a/src/resources/objects/awareness/AwarenessHandler.java
+++ b/src/resources/objects/awareness/AwarenessHandler.java
@@ -109,32 +109,6 @@ public class AwarenessHandler implements AutoCloseable {
 		obj.resetAwareness();
 	}
 	
-	public void transferContainers(SWGObject obj, SWGObject newContainer) {
-		// Remove from previous awareness
-		TerrainMap oldMap = getTerrainMap(obj.getTerrain());
-		if (oldMap != null)
-			oldMap.removeWithoutUpdate(obj);
-		// Update location
-		if (obj.getParent() != newContainer) {
-			obj.moveToContainer(newContainer);
-			obj.onObjectMoved();
-			// Update awareness
-			if (newContainer == null) {
-				Location loc = obj.getLocation();
-				if (obj.getTerrain() != Terrain.GONE) {
-					TerrainMap map = getTerrainMap(loc.getTerrain());
-					if (map != null) {
-						map.moveWithinMap(obj);
-					} else {
-						Log.e("Unknown terrain: %s", loc.getTerrain());
-					}
-				}
-			} else {
-				obj.resetAwareness();
-			}
-		}
-	}
-	
 	public void disappearObject(SWGObject obj, boolean disappearObjects, boolean disappearCustom) {
 		if (obj.getTerrain() != Terrain.GONE) {
 			TerrainMap map = getTerrainMap(obj);
diff --git a/src/services/objects/ObjectAwareness.java b/src/services/objects/ObjectAwareness.java
index 1be3ac367..087f3b599 100644
--- a/src/services/objects/ObjectAwareness.java
+++ b/src/services/objects/ObjectAwareness.java
@@ -188,7 +188,7 @@ public class ObjectAwareness extends Service implements TerrainMapCallback {
 		SWGObject obj = i.getObject();
 		Assert.notNull(obj);
 		Assert.notNull(obj.getTerrain());
-		transferContainers(obj, i.getContainer());
+		moveObject(obj, i.getContainer(), obj.getLocation());
 	}
 	
 	private void handleZoneIn(CreatureObject creature, Player player, Location loc, SWGObject parent) {
@@ -303,10 +303,6 @@ public class ObjectAwareness extends Service implements TerrainMapCallback {
 			awarenessHandler.moveObject(obj, parent, requestedLocation);
 	}
 	
-	private void transferContainers(SWGObject obj, SWGObject newContainer) {
-		awarenessHandler.transferContainers(obj, newContainer);
-	}
-	
 	private void moveObjectWithTransform(SWGObject obj, SWGObject parent, Location requestedLocation, double speed, int update) {
 		moveObject(obj, parent, requestedLocation);
 		if (parent == null)
diff --git a/test/resources/objects/awareness/TestAwarenessHandler.java b/test/resources/objects/awareness/TestAwarenessHandler.java
index 4e259141e..9b4ccfe8a 100644
--- a/test/resources/objects/awareness/TestAwarenessHandler.java
+++ b/test/resources/objects/awareness/TestAwarenessHandler.java
@@ -143,7 +143,7 @@ public class TestAwarenessHandler {
 			callback.testAssert(0, 0, 1, 0);
 			callback.set(0, 0, 0, 0);
 			creature.setPosition(Terrain.TATOOINE, 0, 0, 0);
-			awareness.transferContainers(creature, starport.getCellByNumber(1));
+			awareness.moveObject(creature, starport.getCellByNumber(1), new Location(0, 0, 0, Terrain.TATOOINE));
 			awaitCallbacks(awareness);
 			callback.testAssert(0, 0, 0, 0);
 		}