conflict fix, take 2

This commit is contained in:
Ziggeh
2015-05-22 06:02:58 +02:00
parent 708a015227
commit fe479bd5da
-1
View File
@@ -118,7 +118,6 @@ public class SWGObject implements Serializable, Comparable<SWGObject> {
child.containmentType = 4;
else
child.containmentType = containmentType;
// TODO: Set containmentType based on if object is in a slot (4) or a container (-1)
sendObserversAndSelf(new UpdateContainmentMessage(child.objectId, objectId, containmentType));
}