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

Fixed ConcurrentModificationException in TangibleObject

Browse Source
This commit is contained in:
Obique PSWG
2015-09-29 09:43:06 -05:00
parent fc8d40af31
commit 47583252c0
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/SWGObject.java
+11 -3
View File
@@ -623,7 +623,10 @@ public abstract class SWGObject implements Serializable, Comparable<SWGObject> {
}
public void clearAware() {
List<SWGObject> objects = new ArrayList<>(objectsAware);
List<SWGObject> objects;
synchronized (objectsAware) {
objects = new ArrayList<>(objectsAware);
}
for (SWGObject o : objects) {
o.awarenessOutOfRange(this);
awarenessOutOfRange(o);
@@ -645,8 +648,13 @@ 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);
Set<SWGObject> awareExtra;
synchronized (aware) {
synchronized (objectsAware) {
awareExtra = new HashSet<>(aware);
awareExtra.addAll(objectsAware);
}
}
if (getParent() == null) {
Set<SWGObject> observers = new HashSet<>();
for (SWGObject obj : awareExtra) {