Fix concurrent modification in inter-chunk block connections

Earthcomputer · Oct 11, 2020 · e4a4f01 · e4a4f01
1 parent c34eba0
commit e4a4f01
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/...ava/net/earthcomputer/multiconnect/protocols/generic/blockconnections/ChunkConnector.java b/...ava/net/earthcomputer/multiconnect/protocols/generic/blockconnections/ChunkConnector.java
@@ -91,7 +91,7 @@ public void onNeighborChunkLoaded(Direction side) {
                     while (itr.hasNext()) {
                         short packed = itr.nextShort();
                         pos.set(chunk.getPos().getStartX() + unpackLocalX(packed), unpackLocalY(packed), chunk.getPos().getStartZ() + unpackLocalZ(packed));
-                        updateBlock(pos, worldView.getBlockState(pos).getBlock(), false);
+                        connector.fix(worldView, pos, worldView.getBlockState(pos).getBlock());
                     }
                     blocksNeedingUpdate.remove(dir);
                 }
@@ -100,7 +100,7 @@ public void onNeighborChunkLoaded(Direction side) {
     }
 
     public void onBlockChange(BlockPos pos, Block newBlock, boolean updateNeighbors) {
-        if (updateBlock(pos, newBlock, true) || updateNeighbors) {
+        if (updateBlock(pos, newBlock) || updateNeighbors) {
             for (Direction dir : Direction.values()) {
                 BlockPos offsetPos = new BlockPos(
                         chunk.getPos().getStartX() + (pos.getX() & 15) + dir.getOffsetX(),
@@ -115,15 +115,11 @@ public void onBlockChange(BlockPos pos, Block newBlock, boolean updateNeighbors)
         }
     }
 
-    public boolean updateBlock(BlockPos pos, Block newBlock, boolean checkForUpdateRemoval) {
+    public boolean updateBlock(BlockPos pos, Block newBlock) {
         if (pos.getY() < 0 || pos.getY() > 255) {
             return false;
         }
 
-        if (!checkForUpdateRemoval && !connector.shouldProcess(newBlock)) {
-            return false;
-        }
-
         EightWayDirection dir = directionForPos(pos);
         if (dir == null) {
             return connector.fix(worldView, pos, newBlock);