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

Implemented slot checking when transferring items

Browse Source
This commit is contained in:
Mads Boddum
2016-04-21 14:34:09 +02:00
parent 7758ba16d3
commit f942a067f6
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/SWGObject.java
+11 -4
View File
@@ -141,7 +141,7 @@ public abstract class SWGObject extends BaselineObject implements Comparable<SWG
// Check to make sure this object is able to go into a slot in the parent
List<String> requiredSlots = object.getArrangement().get(arrangementId - 4);
// Note that some objects don't have a descriptor, meaning it has no slots
// Add object to the slot
for (String requiredSlot : requiredSlots) {
setSlot(requiredSlot, object);
@@ -194,10 +194,17 @@ public abstract class SWGObject extends BaselineObject implements Comparable<SWG
Log.w("SWGObject", "Unable to add object to container! Container Full");
return ContainerResult.CONTAINER_FULL;
}
} else {
// Item is going into slot(s)
Map<String, SWGObject> containerSlots = container.getSlots();
for (String slotName : getArrangement().get(arrangementId - 4)) {
SWGObject equippedItem = containerSlots.get(slotName);
if (equippedItem != null) {
equippedItem.moveToContainer(requester, container.getSlottedObject("inventory"));
}
}
}
// TODO Slot occupation check, old version was not working properly, always returning SLOT_OCCUPIED
// Get a pre-parent-removal list of the observers so we can send create/destroy/update messages
Set<SWGObject> oldObservers = getObservers();
Player prevOwner = getOwner();