Fixes

IntellectualSites · Sep 14, 2024 · 3a3648f · 3a3648f
1 parent 63606d7
commit 3a3648f
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 6 deletions.
diff --git a/...main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_R1/PaperweightGetBlocks.java b/...main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_R1/PaperweightGetBlocks.java
@@ -449,15 +449,17 @@ public synchronized <T extends Future<T>> T call(IQueueExtent<? extends IChunk>
                         TextComponent.of("Could not get chunk at " + chunkX + "," + chunkZ + " whilst low memory: " + e.getMessage()));
             }
         }
+        final int finalCopyKey = copyKey;
         // Run immediately if possible
         if (chunk != null) {
-            return internalCall(set, finalizer, chunk, nmsWorld);
+            return internalCall(set, finalizer, finalCopyKey, chunk, nmsWorld);
         }
         // Submit via the STQE as that will help handle excessive queuing by waiting for the submission count to fall below the
         // target size
         nmsChunkFuture.thenApply(nmsChunk -> owner.submitTaskUnchecked(() -> (T) internalCall(
                 set,
                 finalizer,
+                finalCopyKey,
                 nmsChunk,
                 nmsWorld
         )));
@@ -467,7 +469,13 @@ public synchronized <T extends Future<T>> T call(IQueueExtent<? extends IChunk>
         return (T) (Future) CompletableFuture.completedFuture(null);
     }
 
-    private <T extends Future<T>> T internalCall(IChunkSet set, Runnable finalizer, LevelChunk nmsChunk, ServerLevel nmsWorld) {
+    private <T extends Future<T>> T internalCall(
+            IChunkSet set,
+            Runnable finalizer,
+            int copyKey,
+            LevelChunk nmsChunk,
+            ServerLevel nmsWorld
+    ) {
         try {
             PaperweightGetBlocks_Copy copy = createCopy ? new PaperweightGetBlocks_Copy(nmsChunk) : null;
             if (createCopy) {

diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/filter/CountFilter.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/filter/CountFilter.java
@@ -2,9 +2,26 @@
 
 import com.fastasyncworldedit.core.extent.filter.block.FilterBlock;
 
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
+
 public class CountFilter extends ForkedFilter<CountFilter> {
 
-    private int total;
+    private static final VarHandle TOTAL_VAR;
+
+    static {
+        try {
+            TOTAL_VAR = MethodHandles.privateLookupIn(CountFilter.class, MethodHandles.lookup()).findVarHandle(
+                    CountFilter.class,
+                    "total",
+                    int.class
+            );
+        } catch (NoSuchFieldException | IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private int total = 0;
 
     public CountFilter() {
         super(null);
@@ -21,16 +38,16 @@ public CountFilter init() {
 
     @Override
     public void join(CountFilter filter) {
-        this.total += filter.getTotal();
+        TOTAL_VAR.getAndAdd(this, (int) filter.getTotal());
     }
 
     @Override
     public final void applyBlock(FilterBlock block) {
-        total++;
+        TOTAL_VAR.getAndAdd(this, 1);
     }
 
     public int getTotal() {
-        return total;
+        return (int) TOTAL_VAR.get(this);
     }
 
 }