Merge branch 'groups_wip' into quality_assurance

This commit is contained in:
Waverunner
2015-10-13 09:36:55 -04:00
13 changed files with 763 additions and 21 deletions
+3 -3
View File
@@ -804,7 +804,7 @@ public abstract class SWGObject implements Serializable, Comparable<SWGObject> {
}
}
private void awarenessOutOfRange(SWGObject o) {
protected void awarenessOutOfRange(SWGObject o) {
synchronized (objectsAware) {
if (objectsAware.remove(o)) {
Player owner = o.getOwner();
@@ -816,7 +816,7 @@ public abstract class SWGObject implements Serializable, Comparable<SWGObject> {
}
}
private void awarenessInRange(SWGObject o) {
protected void awarenessInRange(SWGObject o) {
synchronized (objectsAware) {
if (objectsAware.add(o)) {
Player owner = o.getOwner();
@@ -827,7 +827,7 @@ public abstract class SWGObject implements Serializable, Comparable<SWGObject> {
}
}
}
private void createObjectObservers(SWGObject obj) {
Set<SWGObject> observers = new HashSet<>();
getChildrenObservers(observers, obj);