From 22eec47c018dfa7baa20fa293cda1d94b93357fb Mon Sep 17 00:00:00 2001
From: Mads Boddum <danish_cyborg@hotmail.com>
Date: Wed, 4 May 2016 16:30:25 +0200
Subject: [PATCH] Put LD character fix into isInAwareness()

---
 src/services/objects/ObjectAwareness.java | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/services/objects/ObjectAwareness.java b/src/services/objects/ObjectAwareness.java
index 523fda11d..1ffcd4aa6 100644
--- a/src/services/objects/ObjectAwareness.java
+++ b/src/services/objects/ObjectAwareness.java
@@ -130,11 +130,6 @@ public class ObjectAwareness extends Service {
 	private void handleObjectCreatedIntent(ObjectCreatedIntent oci) {
 		SWGObject object = oci.getObject();
 		if (isInAwareness(object)) {
-			// We don't add logged out players to awareness when objects are being loaded from ODB.
-			if(object instanceof CreatureObject && ((CreatureObject) object).isLoggedOutPlayer()) {
-				return;
-			}
-			
 			add(object);
 			update(object);
 		}
@@ -247,7 +242,14 @@ public class ObjectAwareness extends Service {
 	}
 	
 	private boolean isInAwareness(SWGObject object) {
-		return object.getParent() == null && object instanceof TangibleObject;
+		if(object.getParent() == null && object instanceof TangibleObject) {
+			// We don't add logged out players to awareness when objects are being loaded from ODB.
+			if(object instanceof CreatureObject && ((CreatureObject) object).isLoggedOutPlayer()) {
+				return false;
+			}
+			return true;
+		}
+		return false;
 	}
 	
 	private double invertNormalizedValue(double x) {