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

Fixed LD bug when characters log out, as well as player tags in general

Browse Source
This commit is contained in:
Obique PSWG
2015-08-20 19:08:50 -05:00
parent ae8830e9b4
commit a69046f47c
5 changed files with 53 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/SWGObject.java
+11 -14
View File
@@ -614,10 +614,7 @@ public abstract class SWGObject implements Serializable, Comparable<SWGObject> {
}
public void clearAware() {
SWGObject [] objects;
synchronized (objectsAware) {
objects = objectsAware.toArray(new SWGObject[objectsAware.size()]);
}
List<SWGObject> objects = new ArrayList<>(objectsAware);
for (SWGObject o : objects) {
o.awarenessOutOfRange(this);
awarenessOutOfRange(o);
@@ -639,21 +636,21 @@ public abstract class SWGObject implements Serializable, Comparable<SWGObject> {
}
private Set<SWGObject> getObserversFromSet(Set<SWGObject> aware, SWGObject childObject) {
Set<SWGObject> awareExtra = new HashSet<>(aware);
awareExtra.addAll(objectsAware);
if (getParent() == null) {
Set<SWGObject> observers = new HashSet<>();
synchronized (aware) {
for (SWGObject obj : aware) {
Player p = obj.getOwner();
if (childObject.isValidPlayer(p))
observers.add(obj);
else
childObject.getChildrenObservers(observers, obj);
}
for (SWGObject obj : awareExtra) {
Player p = obj.getOwner();
if (childObject.isValidPlayer(p))
observers.add(obj);
else
getChildrenObservers(observers, obj);
}
childObject.getChildrenObservers(observers, this);
getChildrenObservers(observers, this);
return observers;
} else {
return getParent().getObserversFromSet(aware, childObject); // Search for top level parent
return getParent().getObserversFromSet(awareExtra, childObject); // Search for top level parent
}
}