From d41438ad65476cf6fd8e89a8d49ef87f21da21be Mon Sep 17 00:00:00 2001
From: Obique PSWG <obique.pswg@gmail.com>
Date: Sun, 21 May 2017 10:31:58 -0500
Subject: [PATCH] Added onObjectMovedInAware function to SWGObject

---
 src/resources/objects/SWGObject.java                 |  8 ++++++++
 .../objects/awareness/AwarenessHandler.java          | 12 ++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/src/resources/objects/SWGObject.java b/src/resources/objects/SWGObject.java
index 87e25a165..5f7499782 100644
--- a/src/resources/objects/SWGObject.java
+++ b/src/resources/objects/SWGObject.java
@@ -715,6 +715,14 @@ public abstract class SWGObject extends BaselineObject implements Comparable<SWG
 		
 	}
 	
+	/**
+	 * Called when an object moves within this object's awareness
+	 * @param aware the object that moved
+	 */
+	public void onObjectMoveInAware(SWGObject aware) {
+		
+	}
+	
 	public boolean isObjectAware(SWGObject aware) {
 		return awareness.isObjectAware(aware);
 	}
diff --git a/src/resources/objects/awareness/AwarenessHandler.java b/src/resources/objects/awareness/AwarenessHandler.java
index 80ad96371..7bf6601bc 100644
--- a/src/resources/objects/awareness/AwarenessHandler.java
+++ b/src/resources/objects/awareness/AwarenessHandler.java
@@ -82,6 +82,7 @@ public class AwarenessHandler implements AutoCloseable {
 		obj.setLocation(requestedLocation);
 		if (obj.getParent() != null)
 			obj.moveToContainer(null);
+		notifyObjectMoved(obj);
 		// Update awareness
 		if (obj.getTerrain() != Terrain.GONE) {
 			TerrainMap map = getTerrainMap(requestedLocation.getTerrain());
@@ -101,6 +102,7 @@ public class AwarenessHandler implements AutoCloseable {
 			oldMap.removeWithoutUpdate(obj);
 		// Update location
 		obj.setLocation(requestedLocation);
+		notifyObjectMoved(obj);
 		// Update awareness
 		if (obj.getParent() != parent)
 			obj.moveToContainer(parent);
@@ -120,6 +122,16 @@ public class AwarenessHandler implements AutoCloseable {
 			obj.clearCustomAware(true);
 	}
 	
+	private void notifyObjectMoved(SWGObject obj) {
+		try {
+			for (SWGObject aware : obj.getObjectsAware())
+				obj.onObjectMoveInAware(aware);
+		} catch (Throwable t) {
+			Log.e("Throwable caught when notifying onObjectMoveInAware");
+			Log.e(t);
+		}
+	}
+	
 	private TerrainMap getTerrainMap(SWGObject object) {
 		Terrain t = object.getTerrain();
 		if (t == null)