projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-10-06 21:13:37 -04:00
Code Issues Projects Releases Wiki Activity

Fixed CREO equipment and SWGObject.removeObject

Browse Source
This commit is contained in:
Obique PSWG
2016-05-31 11:38:20 -05:00
parent 681386f326
commit f2f7e35177
3 changed files with 11 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/SWGObject.java
+1 -2
View File
@@ -163,7 +163,7 @@ public abstract class SWGObject extends BaselineObject implements Comparable<SWG
// This object is a container object, so remove it from the container
if (object.getSlotArrangement() == -1) {
synchronized (containedObjects) {
containedObjects.remove(object.objectId);
containedObjects.remove(object);
}
} else {
for (String slot : (slotArrangement == -1 ?
@@ -250,7 +250,6 @@ public abstract class SWGObject extends BaselineObject implements Comparable<SWG
for (String slotName : getArrangement().get(arrangementId - 4)) {
SWGObject equippedItem = container.getSlottedObject(slotName);
if (equippedItem != null) {
Log.d("SWGObject", "Moving %s into inventory %s", equippedItem, container.getSlottedObject("inventory"));
equippedItem.moveToContainer(requester, container.getSlottedObject("inventory"));
}
}