From 9dcd8b77401ef7ac542209d21988cff30b47b75d Mon Sep 17 00:00:00 2001
From: Obique PSWG <obique.pswg@gmail.com>
Date: Tue, 24 May 2016 21:44:03 -0500
Subject: [PATCH] Added createObject/destroyObject

---
 src/resources/objects/SWGObject.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/resources/objects/SWGObject.java b/src/resources/objects/SWGObject.java
index 206878f9e..096698ce8 100644
--- a/src/resources/objects/SWGObject.java
+++ b/src/resources/objects/SWGObject.java
@@ -783,15 +783,21 @@ public abstract class SWGObject extends BaselineObject implements Comparable<SWG
 	}
 	
 	public void addCustomAware(SWGObject aware) {
+		boolean changed = false;
 		synchronized (customAware) {
-			customAware.add(aware);
+			changed = customAware.add(aware);
 		}
+		if (changed && aware.getOwner() != null)
+			createObject(aware.getOwner());
 	}
 	
 	public void removeCustomAware(SWGObject aware) {
+		boolean changed = false;
 		synchronized (customAware) {
-			customAware.remove(aware);
+			changed = customAware.remove(aware);
 		}
+		if (changed && aware.getOwner() != null)
+			destroyObject(aware.getOwner());
 	}
 	
 	public Set<SWGObject> getObservers() {