diff --git a/src/services/objects/ObjectManager.java b/src/services/objects/ObjectManager.java index 5bdcf234e..6f894dd0f 100644 --- a/src/services/objects/ObjectManager.java +++ b/src/services/objects/ObjectManager.java @@ -260,9 +260,11 @@ public class ObjectManager extends Manager { destroyObject(slottedObj); } - for (SWGObject containedObj : object.getContainedObjects()) { - if (containedObj != null) - destroyObject(containedObj); + Iterator containerIterator = object.getContainedObjects().iterator(); + while(containerIterator.hasNext()) { + SWGObject containedObject = containerIterator.next(); + if (containedObject != null) + destroyObject(containedObject); } // Remove object from the parent