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

sendUpdatedContainment is no longer attempted to be sent if the object has a null parent

Browse Source
This commit is contained in:
Waverunner
2015-06-06 09:21:35 -04:00
parent cdcfeccae1
commit 078ddc115c
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/SWGObject.java
+6 -1
View File
@@ -576,6 +576,9 @@ public abstract class SWGObject implements Serializable, Comparable<SWGObject> {
}
private void sendUpdatedContainment(List<SWGObject> oldObservers, List<SWGObject> newObservers) {
if (parent == null)
return;
List<SWGObject> same = new ArrayList<>(oldObservers);
same.retainAll(newObservers);
@@ -586,7 +589,9 @@ public abstract class SWGObject implements Serializable, Comparable<SWGObject> {
removed.removeAll(newObservers);
for (SWGObject swgObject : same) {
swgObject.sendSelf(new UpdateContainmentMessage(objectId, parent.getObjectId(), slotArrangement));
if (swgObject.getOwner() != null) {
swgObject.sendSelf(new UpdateContainmentMessage(objectId, parent.getObjectId(), slotArrangement));
}
}
for (SWGObject swgObject : added) {