From 8e08c9adb887d97229d015cda10d10e51f36af51 Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Tue, 12 Nov 2013 20:19:06 -0500 Subject: [PATCH] Once and for all fixed ConcurrentModificationException --- common/mekanism/api/transmitters/DynamicNetwork.java | 4 ++-- common/mekanism/common/EnergyNetwork.java | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/common/mekanism/api/transmitters/DynamicNetwork.java b/common/mekanism/api/transmitters/DynamicNetwork.java index 7d45dfdec..0478dc8c9 100644 --- a/common/mekanism/api/transmitters/DynamicNetwork.java +++ b/common/mekanism/api/transmitters/DynamicNetwork.java @@ -20,8 +20,8 @@ public abstract class DynamicNetwork implements ITransmitterNetwork { public HashSet> transmitters = new HashSet>(); - public Set possibleAcceptors = Collections.synchronizedSet(new HashSet()); - public Map acceptorDirections = Collections.synchronizedMap(new HashMap()); + public HashSet possibleAcceptors = new HashSet(); + public HashMap acceptorDirections = new HashMap(); protected int ticksSinceCreate = 0; diff --git a/common/mekanism/common/EnergyNetwork.java b/common/mekanism/common/EnergyNetwork.java index b27e8b4db..8713b7a19 100644 --- a/common/mekanism/common/EnergyNetwork.java +++ b/common/mekanism/common/EnergyNetwork.java @@ -164,7 +164,9 @@ public class EnergyNetwork extends DynamicNetwork { Set toReturn = new HashSet(); - for(TileEntity acceptor : possibleAcceptors) + Set copy = (Set)possibleAcceptors.clone(); + + for(TileEntity acceptor : copy) { if(acceptor instanceof IStrictEnergyAcceptor) {