projectswg-bitbucket/cucore
1
0
Fork 0
mirror of https://bitbucket.org/projectswg/cucore.git synced 2026-08-04 04:16:00 -04:00
Code Issues Projects Releases Wiki Activity

UpdateContainmentMessage is sent even if parent is null

Browse Source 
This should hopefully fix the blue ghost problems with equipping/unequipping items
This commit is contained in:
Waverunner
2015-06-06 14:08:26 -04:00
parent 827c379952
commit 81e9b8f0b0
3 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/SWGObject.java
+2 -8
View File
@@ -579,9 +579,6 @@ 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);
@@ -592,9 +589,7 @@ public abstract class SWGObject implements Serializable, Comparable<SWGObject> {
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<SWGObject> {
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<SWGObject> {
//Log.i("ChildrenObjects", "Sending containedObj " + containedObject + " to " + target);
//Log.d("SWGObject", "Sending to location " + containedObject.getLocation());
containedObject.createObject(target);
sentObjects.add(containedObject);
}
}
}