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

Fixed observers for non-creature object

Browse Source
This commit is contained in:
Obique PSWG
2015-10-10 15:03:42 -05:00
parent 578502d213
commit a81bffa954
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
@@ -674,9 +674,9 @@ public abstract class SWGObject implements Serializable, Comparable<SWGObject> {
if (childObject.isValidPlayer(p))
observers.add(obj);
else
getChildrenObservers(observers, obj);
childObject.getChildrenObservers(observers, obj);
}
getChildrenObservers(observers, this);
childObject.getChildrenObservers(observers, this);
return observers;
} else {
return getParent().getObserversFromSet(awareExtra, childObject); // Search for top level parent
@@ -705,7 +705,7 @@ public abstract class SWGObject implements Serializable, Comparable<SWGObject> {
if (player.equals(owner))
return false;
if (owner == null)
return false;
return true;
SWGObject creature = owner.getCreatureObject();
if (creature == null)
return false;