From 92fb58f0c6f0697e547c9e2bebecabc2e10f492a Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Mon, 24 Jun 2024 06:48:48 -0700 Subject: [PATCH] Work around CME * Not entirely sure why it's being concurrently modified.. so let's just make it safe for now --- .../crazypants/enderio/conduit/TileConduitBundle.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java b/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java index 84172c39..d0e36bdb 100644 --- a/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java @@ -2,6 +2,7 @@ package crazypants.enderio.conduit; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.EnumSet; import java.util.HashSet; import java.util.List; @@ -66,7 +67,7 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle { public static final short NBT_VERSION = 1; - private final List conduits = new ArrayList(); + private final List conduits = Collections.synchronizedList(new ArrayList<>()); private Block facadeId = null; private int facadeMeta = 0; @@ -74,9 +75,9 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle { private boolean facadeChanged; - private final List cachedCollidables = new ArrayList(); + private final List cachedCollidables = new ArrayList<>(); - private final List cachedConnectors = new ArrayList(); + private final List cachedConnectors = new ArrayList<>(); private boolean conduitsDirty = true; private boolean collidablesDirty = true; @@ -536,7 +537,7 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle { @Override public List getConnectors() { - List result = new ArrayList(); + List result = new ArrayList<>(); addConnectors(result); return result; }