diff --git a/scripts/commands/generic/transferItemMisc.py b/scripts/commands/generic/transferItemMisc.py index 97f6996cf..6efa0f714 100644 --- a/scripts/commands/generic/transferItemMisc.py +++ b/scripts/commands/generic/transferItemMisc.py @@ -1,8 +1,6 @@ import sys def execute(galacticManager, player, target, args): - return - actor = player.getCreatureObject() if actor is None or target is None: return @@ -13,11 +11,11 @@ def execute(galacticManager, player, target, args): return if target.getParent() == actor: - target.moveToContainer(actor, inventory) + result = target.moveToContainer(actor, inventory) actor.removeEquipment(target) return else: - target.moveToContainer(actor, actor) + result = target.moveToContainer(actor, actor) actor.addEquipment(target) return diff --git a/src/resources/collections/SWGList.java b/src/resources/collections/SWGList.java index de1a40fe9..4b762ce68 100644 --- a/src/resources/collections/SWGList.java +++ b/src/resources/collections/SWGList.java @@ -281,4 +281,9 @@ public class SWGList extends AbstractList implements Encodable { public BaselineType getBaseline() { return baseline; } public int getViewType() { return view; } public int getUpdateType() { return updateType; } + + @Override + public String toString() { + return "SWGList[" + baseline + "0" + view + ":" + updateType + "]"; + } } diff --git a/src/resources/objects/SWGObject.java b/src/resources/objects/SWGObject.java index 5bd909f5b..cdcab77b9 100644 --- a/src/resources/objects/SWGObject.java +++ b/src/resources/objects/SWGObject.java @@ -579,9 +579,6 @@ public abstract class SWGObject implements Serializable, Comparable { } private void sendUpdatedContainment(List oldObservers, List newObservers) { - if (parent == null) - return; - List same = new ArrayList<>(oldObservers); same.retainAll(newObservers); @@ -592,9 +589,7 @@ public abstract class SWGObject implements Serializable, Comparable { removed.removeAll(newObservers); for (SWGObject swgObject : same) { - if (swgObject.getOwner() != null) { - swgObject.sendSelf(new UpdateContainmentMessage(objectId, parent.getObjectId(), slotArrangement)); - } + swgObject.sendSelf(new UpdateContainmentMessage(objectId, parent.getObjectId(), slotArrangement)); } for (SWGObject swgObject : added) { @@ -669,7 +664,7 @@ public abstract class SWGObject implements Serializable, Comparable { return; if (!hasPermission(target.getCreatureObject(), ContainerPermissions.Permission.OPEN)) { - Log.w("SWGObject", target.getCreatureObject() + " doesn't have permission to view " + this + " -- skipping packet sending"); + Log.i("SWGObject", target.getCreatureObject() + " doesn't have permission to view " + this + " -- skipping packet sending"); return; } @@ -690,7 +685,6 @@ public abstract class SWGObject implements Serializable, Comparable { //Log.i("ChildrenObjects", "Sending containedObj " + containedObject + " to " + target); //Log.d("SWGObject", "Sending to location " + containedObject.getLocation()); containedObject.createObject(target); - sentObjects.add(containedObject); } } }