From 0bb6eacaf723170b0d8f86d5d185e2cebab3672d Mon Sep 17 00:00:00 2001
From: tastybento <tastybento@users.noreply.github.com>
Date: Fri, 31 May 2024 13:11:57 -0700
Subject: [PATCH] Update IslandLevelCalculator.java (#314)

Fix for occasional errors likely due to the use of the remove() method within a lambda expression inside the thenAccept method. This lambda expression is executed asynchronously, which means that the iterator may not be in a consistent state when remove() is called.
---
 .../calculators/IslandLevelCalculator.java    | 54 +++++++++++--------
 1 file changed, 32 insertions(+), 22 deletions(-)

diff --git a/src/main/java/world/bentobox/level/calculators/IslandLevelCalculator.java b/src/main/java/world/bentobox/level/calculators/IslandLevelCalculator.java
index 8904cdf..0db44ef 100644
--- a/src/main/java/world/bentobox/level/calculators/IslandLevelCalculator.java
+++ b/src/main/java/world/bentobox/level/calculators/IslandLevelCalculator.java
@@ -638,27 +638,37 @@ public class IslandLevelCalculator {
     }
 
     private void handleStackedBlocks() {
-	// Deal with any stacked blocks
-	Iterator<Location> it = stackedBlocks.iterator();
-	while (it.hasNext()) {
-	    Location v = it.next();
-	    Util.getChunkAtAsync(v).thenAccept(c -> {
-		Block stackedBlock = v.getBlock();
-		boolean belowSeaLevel = seaHeight > 0 && v.getBlockY() <= seaHeight;
-		if (WildStackerAPI.getWildStacker().getSystemManager().isStackedBarrel(stackedBlock)) {
-		    StackedBarrel barrel = WildStackerAPI.getStackedBarrel(stackedBlock);
-		    int barrelAmt = WildStackerAPI.getBarrelAmount(stackedBlock);
-		    for (int _x = 0; _x < barrelAmt; _x++) {
-			checkBlock(barrel.getType(), belowSeaLevel);
-		    }
-		} else if (WildStackerAPI.getWildStacker().getSystemManager().isStackedSpawner(stackedBlock)) {
-		    int spawnerAmt = WildStackerAPI.getSpawnersAmount((CreatureSpawner) stackedBlock.getState());
-		    for (int _x = 0; _x < spawnerAmt; _x++) {
-			checkBlock(stackedBlock.getType(), belowSeaLevel);
-		    }
-		}
-		it.remove();
-	    });
-	}
+    // Deal with any stacked blocks
+    List<Location> toRemove = new ArrayList<>();
+    Iterator<Location> it = stackedBlocks.iterator();
+    while (it.hasNext()) {
+        Location v = it.next();
+        Util.getChunkAtAsync(v).thenAccept(c -> {
+            Block stackedBlock = v.getBlock();
+            boolean belowSeaLevel = seaHeight > 0 && v.getBlockY() <= seaHeight;
+            if (WildStackerAPI.getWildStacker().getSystemManager().isStackedBarrel(stackedBlock)) {
+                StackedBarrel barrel = WildStackerAPI.getStackedBarrel(stackedBlock);
+                int barrelAmt = WildStackerAPI.getBarrelAmount(stackedBlock);
+                for (int _x = 0; _x < barrelAmt; _x++) {
+                    checkBlock(barrel.getType(), belowSeaLevel);
+                }
+            } else if (WildStackerAPI.getWildStacker().getSystemManager().isStackedSpawner(stackedBlock)) {
+                int spawnerAmt = WildStackerAPI.getSpawnersAmount((CreatureSpawner) stackedBlock.getState());
+                for (int _x = 0; _x < spawnerAmt; _x++) {
+                    checkBlock(stackedBlock.getType(), belowSeaLevel);
+                }
+            }
+            synchronized (toRemove) {
+                toRemove.add(v);
+            }
+        });
+    }
+
+    // Wait for all asynchronous tasks to complete before removing elements
+    // Remove the elements collected in toRemove
+    synchronized (toRemove) {
+        stackedBlocks.removeAll(toRemove);
     }
 }
+
+}