Fixed allocator not marking chunks before validation

Author: Devlrxxh

Plugin/src/main/java/dev/lrxh/neptune/game/arena/Arena.java

@@ -2,7 +2,6 @@
 
 import dev.lrxh.api.arena.IArena;
 import dev.lrxh.blockChanger.snapshot.CuboidSnapshot;
-import dev.lrxh.neptune.Neptune;
 import dev.lrxh.neptune.configs.impl.SettingsLocale;
 import dev.lrxh.neptune.game.arena.allocator.Allocation;
 import dev.lrxh.neptune.game.arena.allocator.SpatialAllocator;
@@ -98,6 +97,7 @@ public boolean isSetup() {
     }
 
     public synchronized CompletableFuture<Arena> createDuplicate() {
+
         if (snapshot == null) {
             CompletableFuture<Arena> failed = new CompletableFuture<>();
             failed.completeExceptionally(new IllegalStateException("CuboidSnapshot not ready"));
@@ -127,23 +127,22 @@ public synchronized CompletableFuture<Arena> createDuplicate() {
 
         final int originalMinChunkX = min.getBlockX() >> 4;
         final int originalMinChunkZ = min.getBlockZ() >> 4;
-
         final int chunkOffsetX = allocation.chunkX - originalMinChunkX;
         final int chunkOffsetZ = allocation.chunkZ - originalMinChunkZ;
-
         final int offsetBlocksX = chunkOffsetX * 16;
         final int offsetBlocksZ = chunkOffsetZ * 16;
 
-
         Location newRedSpawn = (this.redSpawn != null ? LocationUtil.addOffset(this.redSpawn.clone(), offsetBlocksX, offsetBlocksZ) : null);
         Location newBlueSpawn = (this.blueSpawn != null ? LocationUtil.addOffset(this.blueSpawn.clone(), offsetBlocksX, offsetBlocksZ) : null);
         Location newMin = LocationUtil.addOffset(this.min.clone(), offsetBlocksX, offsetBlocksZ);
         Location newMax = LocationUtil.addOffset(this.max.clone(), offsetBlocksX, offsetBlocksZ);
 
         CompletableFuture<Arena> future = new CompletableFuture<>();
+
         snapshot.offset(offsetBlocksX, offsetBlocksZ)
                 .thenApplyAsync(cuboidSnapshot -> {
-                    cuboidSnapshot.restore(true);
+                    cuboidSnapshot.restore(false);
+
                     return new Arena(
                             this.name + "#" + currentIndex,
                             this.displayName,
@@ -166,11 +165,13 @@ public synchronized CompletableFuture<Arena> createDuplicate() {
                     } else {
                         future.complete(arena);
                     }
+
                 });
 
         return future;
     }
 
+
     public List<String> getWhitelistedBlocksAsString() {
         List<String> result = new ArrayList<>();
         for (Material mat : whitelistedBlocks) {
@@ -200,7 +201,7 @@ public void remove() {
 
     public void restore() {
         if (snapshot != null) {
-            snapshot.restore(true);
+            snapshot.restore(false);
         }
     }
 

Plugin/src/main/java/dev/lrxh/neptune/game/arena/allocator/SpatialAllocator.java

@@ -1,6 +1,5 @@
 package dev.lrxh.neptune.game.arena.allocator;
 
-import dev.lrxh.neptune.Neptune;
 import dev.lrxh.neptune.configs.impl.SettingsLocale;
 
 import java.util.concurrent.ConcurrentHashMap;
@@ -95,6 +94,14 @@ private Allocation reserveAt(int startChunkX, int startChunkZ, int widthChunks,
         try {
             allocations.put(id, alloc);
 
+            // ✅ Reserve the region first
+            for (int x = startChunkX; x < startChunkX + widthChunks; x++) {
+                for (int z = startChunkZ; z < startChunkZ + depthChunks; z++) {
+                    occupancy.put(keyFor(x, z), id);
+                }
+            }
+
+            // ✅ Now verify that all chunks were successfully marked
             int mismatches = 0;
             for (int x = startChunkX; x < startChunkX + widthChunks; x++) {
                 for (int z = startChunkZ; z < startChunkZ + depthChunks; z++) {
@@ -104,7 +111,9 @@ private Allocation reserveAt(int startChunkX, int startChunkZ, int widthChunks,
                     }
                 }
             }
+
             if (mismatches > 0) {
+                // Rollback if verification fails
                 for (int x = startChunkX; x < startChunkX + widthChunks; x++) {
                     for (int z = startChunkZ; z < startChunkZ + depthChunks; z++) {
                         occupancy.remove(keyFor(x, z), id);
@@ -116,6 +125,7 @@ private Allocation reserveAt(int startChunkX, int startChunkZ, int widthChunks,
 
             return alloc;
         } catch (RuntimeException ex) {
+            // Rollback if any unexpected exception occurs
             for (int x = startChunkX; x < startChunkX + widthChunks; x++) {
                 for (int z = startChunkZ; z < startChunkZ + depthChunks; z++) {
                     occupancy.remove(keyFor(x, z), id);
@@ -126,6 +136,7 @@ private Allocation reserveAt(int startChunkX, int startChunkZ, int widthChunks,
         }
     }
 
+
     public synchronized void free(long allocationId) {
         Allocation alloc = allocations.remove(allocationId);
         if (alloc == null)