diff --git a/src/resources/objects/creature/CreatureObject.java b/src/resources/objects/creature/CreatureObject.java index ea15438d..e65109d7 100644 --- a/src/resources/objects/creature/CreatureObject.java +++ b/src/resources/objects/creature/CreatureObject.java @@ -1821,15 +1821,6 @@ public class CreatureObject extends TangibleObject implements Serializable { getSlottedObject("inventory").viewChildren(this, true, true, (obj) -> adder.increment()); return adder.intValue(); } - - public Vector getItemsInInventoryByStfName(CreatureObject creature, String stfName) { - Vector itemList = new Vector(); - SWGObject inventory = creature.getSlottedObject("inventory"); - - inventory.viewChildren(creature, false, false, (item) -> { if (item.getStfName() == stfName) { itemList.add(item); } }); - - return itemList; - } public ObjectMessageBuilder getMessageBuilder() { return messageBuilder; diff --git a/src/services/object/ObjectService.java b/src/services/object/ObjectService.java index 65fd0562..1c9940da 100644 --- a/src/services/object/ObjectService.java +++ b/src/services/object/ObjectService.java @@ -731,6 +731,16 @@ public class ObjectService implements INetworkDispatch { return objectId; } + + public Vector getItemsInContainerByStfName(CreatureObject creature, String containerName, String stfName) { + Vector itemList = new Vector(); + SWGObject container = creature.getSlottedObject(containerName); + + container.viewChildren(creature, false, false, (item) -> { if (item.getStfName() == stfName) { itemList.add(item); } }); + + return itemList; + } + public void useObject(CreatureObject creature, final SWGObject object) { if (creature == null || object == null) {