From 835e9f5fe4f128aa2e07a5b5b77c4b3b82705fd3 Mon Sep 17 00:00:00 2001 From: CharonInferar Date: Sun, 5 Oct 2014 22:05:01 +0200 Subject: [PATCH] Added the check in more places --- src/services/object/ObjectService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/services/object/ObjectService.java b/src/services/object/ObjectService.java index bd843e93..f77ccb59 100644 --- a/src/services/object/ObjectService.java +++ b/src/services/object/ObjectService.java @@ -1543,7 +1543,8 @@ public class ObjectService implements INetworkDispatch { // Treeku - Refactored to work around duplicate objectIds // Required for instances/heroics which are duplicated ie. 10 times - if(!template.equals("object/cell/shared_cell.iff") && objectId != 0 && getObject(objectId) != null) { + //if(!template.equals("object/cell/shared_cell.iff") && objectId != 0 && getObject(objectId) != null) { + if(!template.equals("object/cell/shared_cell.iff") && objectId != 0 && checkIfObjectAlreadyInList(objectId)) { SWGObject object = getObject(objectId); // Same coordinates is a true duplicate @@ -1562,7 +1563,8 @@ public class ObjectService implements INetworkDispatch { String planetName = planet.getName(); // TODO needs to a way to work for mustafar and kashyyyk which both have instances - if (objectId != 0 && getObject(objectId) != null && (planetName.contains("dungeon") || planetName.contains("adventure"))) { + //if (objectId != 0 && getObject(objectId) != null && (planetName.contains("dungeon") || planetName.contains("adventure"))) { + if (objectId != 0 && checkIfObjectAlreadyInList(objectId) && (planetName.contains("dungeon") || planetName.contains("adventure"))) { SWGObject container = getObject(containerId); float x = (px + ((container == null) ? x1 : container.getPosition().x)); float z = (pz + ((container == null) ? z1 : container.getPosition().z));