From df3d11779cb03b430e79ba773a09bab7ebd42445 Mon Sep 17 00:00:00 2001
From: CharonInferar <CharonInferar@aol.de>
Date: Sun, 5 Oct 2014 21:47:08 +0200
Subject: [PATCH] Added check to ObjectService

Makes it easier to differentiate if an object is really missing from
objectList from the check in select character that checks for the object
in the list.
---
 src/services/object/ObjectService.java | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/services/object/ObjectService.java b/src/services/object/ObjectService.java
index 5819ab18..bd843e93 100644
--- a/src/services/object/ObjectService.java
+++ b/src/services/object/ObjectService.java
@@ -583,6 +583,15 @@ public class ObjectService implements INetworkDispatch {
 		return object;
 	}
 	
+	public boolean checkIfObjectAlreadyInList(long objectID){
+		SWGObject object = objectList.get(objectID);
+		
+		if (object == null)
+			return false;
+		else
+			return true;
+	}
+	
 	public Map<Long, SWGObject> getObjectList() {
 		return objectList;
 	}
@@ -1232,7 +1241,9 @@ public class ObjectService implements INetworkDispatch {
 						if(object.getParentId() != 0 && object.getContainer() == null)
 							object.setParent(getObject(object.getParentId()));
 						object.getContainerInfo(object.getTemplate());
-						if(getObject(object.getObjectID()) != null)
+//						if(getObject(object.getObjectID()) != null)
+//							objectList.put(object.getObjectID(), object);
+						if(! checkIfObjectAlreadyInList(object.getObjectID()))
 							objectList.put(object.getObjectID(), object);
 					} else {
 						Thread.currentThread().dumpStack();