mirror of
https://bitbucket.org/projectswg/cucore.git
synced 2026-07-13 20:00:58 -04:00
conflict fix, take 2
This commit is contained in:
@@ -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));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user