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 issue where not both custom awareness sets were cleared

Browse Source
This commit is contained in:
Obique PSWG
2016-05-25 23:31:51 -05:00
parent 04716ab64c
commit b7c8e72ee5
1 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/SWGObject.java
+14 -18
View File
@@ -780,30 +780,30 @@ public abstract class SWGObject extends BaselineObject implements Comparable<SWG
}
public void addCustomAware(SWGObject aware) {
internalAddCustomAware(aware);
aware.internalAddCustomAware(this);
internalAddCustomAware(aware, true);
aware.internalAddCustomAware(this, true);
}
public void removeCustomAware(SWGObject aware) {
internalRemoveCustomAware(aware);
aware.internalRemoveCustomAware(this);
internalRemoveCustomAware(aware, true);
aware.internalRemoveCustomAware(this, true);
}
private void internalAddCustomAware(SWGObject aware) {
private void internalAddCustomAware(SWGObject aware, boolean sendUpdates) {
boolean changed = false;
synchronized (customAware) {
changed = customAware.add(aware);
}
if (changed && aware.getOwner() != null)
if (changed && sendUpdates && aware.getOwner() != null)
createObject(aware.getOwner());
}
private void internalRemoveCustomAware(SWGObject aware) {
private void internalRemoveCustomAware(SWGObject aware, boolean sendUpdates) {
boolean changed = false;
synchronized (customAware) {
changed = customAware.remove(aware);
}
if (changed && aware.getOwner() != null)
if (changed && sendUpdates && aware.getOwner() != null)
destroyObject(aware.getOwner());
}
@@ -814,17 +814,13 @@ public abstract class SWGObject extends BaselineObject implements Comparable<SWG
}
public void clearCustomAware(boolean sendUpdates) {
if (sendUpdates) {
Set<SWGObject> copy;
synchronized (customAware) {
copy = new HashSet<>(customAware);
}
for (SWGObject aware : copy) {
removeCustomAware(aware);
}
}
Set<SWGObject> copy;
synchronized (customAware) {
customAware.clear();
copy = new HashSet<>(customAware);
}
for (SWGObject aware : copy) {
internalRemoveCustomAware(aware, sendUpdates);
aware.internalRemoveCustomAware(this, sendUpdates);
}
}