From 2e353b4da9b249cbf2fa5708e03be4b225645a7e Mon Sep 17 00:00:00 2001
From: Obique PSWG <obique.pswg@gmail.com>
Date: Thu, 4 Jun 2015 19:34:46 -0500
Subject: [PATCH] Removed character from object awareness when disappearing and
 adding when zoning in

---
 src/services/objects/ObjectManager.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/services/objects/ObjectManager.java b/src/services/objects/ObjectManager.java
index c644952b..48d2f371 100644
--- a/src/services/objects/ObjectManager.java
+++ b/src/services/objects/ObjectManager.java
@@ -186,6 +186,7 @@ public class ObjectManager extends Manager {
 			switch (((PlayerEventIntent)i).getEvent()) {
 				case PE_DISAPPEAR:
 					p.getCreatureObject().clearAware();
+					objectAwareness.remove(p.getCreatureObject());
 					break;
 				case PE_ZONE_IN:
 					p.getCreatureObject().clearAware();
@@ -340,6 +341,7 @@ public class ObjectManager extends Manager {
 			Log.e("ObjectManager", "Failed to start zone - CreatureObject doesn't have a ghost [Character: %d  User: %s", characterId, player.getUsername());
 			return;
 		}
+		objectAwareness.add(creatureObj);
 		new ZoneInIntent(player, (CreatureObject) creatureObj, galaxy).broadcast();
 	}