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

Attempt at merge conflict fix

Browse Source
This commit is contained in:
Ziggeh
2015-05-22 05:59:03 +02:00
parent 0f5834851c
commit 708a015227
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/SWGObject.java
+3 -3
View File
@@ -117,10 +117,10 @@ public class SWGObject implements Serializable, Comparable<SWGObject> {
if (containmentType == null)
child.containmentType = 4;
else
child.containmentType = containmentType.intValue();
sendObserversAndSelf(new UpdateContainmentMessage(child.objectId, objectId, containmentType));
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));
}
public void addAttribute(String attribute, String value) {