fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix ConcurrentModificatonException in NetworkEventBus (#3660)

Browse Source
This commit is contained in:
fscan
2018-08-01 00:35:44 +02:00
committed by GitHub
parent f8d5f4ddb1
commit fa2b4fabc7
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/me/NetworkEventBus.java
+13 -3
View File
@@ -29,6 +29,7 @@ import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import appeng.api.networking.IGridNode; import appeng.api.networking.IGridNode;
import appeng.api.networking.IMachineSet;
import appeng.api.networking.events.MENetworkEvent; import appeng.api.networking.events.MENetworkEvent;
import appeng.api.networking.events.MENetworkEventSubscribe; import appeng.api.networking.events.MENetworkEventSubscribe;
import appeng.core.AELog; import appeng.core.AELog;
@@ -114,10 +115,19 @@ public class NetworkEventBus
target.invoke( cache.getCache(), e ); target.invoke( cache.getCache(), e );
} }
for( final IGridNode obj : g.getMachines( subscriber.getKey() ) ) // events may create or remove grid nodes in rare cases
final IMachineSet machines = g.getMachines( subscriber.getKey() );
final List<IGridNode> work = new ArrayList<>( machines.size() );
machines.forEach( work::add );
for( final IGridNode obj : work )
{ {
x++; // stil part of grid?
target.invoke( obj.getMachine(), e ); if( machines.contains( obj ) )
{
x++;
target.invoke( obj.getMachine(), e );
}
} }
} }
} }