feat: improve fawe limits (#2773) (#2858)

* feat: improve fawe limits (#2773)

 - add FaweLimit implementations for increasing concurrency levels
 - allow FaweLimit to perform processing (and forcefully disable as required) to capture [tile] entities
 - Use `BlockVector3#set(Extent orDefault)` where appropriate to reduce block checks
 - fixes #2679
 - fixes #1874

(cherry picked from commit 6052fc3128)

* fix: actually apply a filter if applied from a full region chunk section
 - cannot remember why I made this change in the first place in #2773 but this fixes edits having "empty middles"
 - doesn't seem to have broken anything in testing

* Reduce limit to always atomic

worldedit-core/src/main/java/com/fastasyncworldedit/core/FaweCache.java

@@ -192,17 +192,22 @@ public enum FaweCache implements Trimable {
             Type.OUTSIDE_REGION
     );
     public static final FaweException MAX_CHECKS = new FaweException(
-            Caption.of("fawe.cancel.reason.max" + ".checks"),
+            Caption.of("fawe.cancel.reason.max.checks"),
+            Type.MAX_CHECKS,
+            true
+    );
+    public static final FaweException MAX_FAILS = new FaweException(
+            Caption.of("fawe.cancel.reason.max.fails"),
             Type.MAX_CHECKS,
             true
     );
     public static final FaweException MAX_CHANGES = new FaweException(
-            Caption.of("fawe.cancel.reason.max" + ".changes"),
+            Caption.of("fawe.cancel.reason.max.changes"),
             Type.MAX_CHANGES,
             false
     );
     public static final FaweException LOW_MEMORY = new FaweException(
-            Caption.of("fawe.cancel.reason.low" + ".memory"),
+            Caption.of("fawe.cancel.reason.low.memory"),
             Type.LOW_MEMORY,
             false
     );

worldedit-core/src/main/java/com/fastasyncworldedit/core/configuration/Settings.java

@@ -123,29 +123,31 @@ public class Settings extends Config {
                         limit.MAX_ACTIONS,
                         newLimit.MAX_ACTIONS != -1 ? newLimit.MAX_ACTIONS : Integer.MAX_VALUE
                 );
-                limit.MAX_CHANGES = Math.max(
+                limit.MAX_CHANGES.set(Math.max(
-                        limit.MAX_CHANGES,
+                        limit.MAX_CHANGES.get(),
                         newLimit.MAX_CHANGES != -1 ? newLimit.MAX_CHANGES : Long.MAX_VALUE
-                );
+                ));
-                limit.MAX_BLOCKSTATES = Math.max(
+                limit.MAX_BLOCKSTATES.set(Math.max(
-                        limit.MAX_BLOCKSTATES,
+                        limit.MAX_BLOCKSTATES.get(),
                         newLimit.MAX_BLOCKSTATES != -1 ? newLimit.MAX_BLOCKSTATES : Integer.MAX_VALUE
-                );
+                ));
-                limit.MAX_CHECKS = Math.max(
+                limit.MAX_CHECKS.set(Math.max(
-                        limit.MAX_CHECKS,
+                        limit.MAX_CHECKS.get(),
                         newLimit.MAX_CHECKS != -1 ? newLimit.MAX_CHECKS : Long.MAX_VALUE
-                );
+                ));
-                limit.MAX_ENTITIES = Math.max(
+                limit.MAX_ENTITIES.set(Math.max(
-                        limit.MAX_ENTITIES,
+                        limit.MAX_ENTITIES.get(),
                         newLimit.MAX_ENTITIES != -1 ? newLimit.MAX_ENTITIES : Integer.MAX_VALUE
-                );
+                ));
-                limit.MAX_FAILS = Math.max(limit.MAX_FAILS, newLimit.MAX_FAILS != -1 ? newLimit.MAX_FAILS : Integer.MAX_VALUE);
+                limit.MAX_FAILS.set(Math.max(
-                limit.MAX_ITERATIONS = Math.max(
+                        limit.MAX_FAILS.get(),
-                        limit.MAX_ITERATIONS, newLimit.MAX_ITERATIONS != -1 ? newLimit.MAX_ITERATIONS : Integer.MAX_VALUE);
+                        newLimit.MAX_FAILS != -1 ? newLimit.MAX_FAILS : Integer.MAX_VALUE
-                limit.MAX_RADIUS = Math.max(
+                ));
-                        limit.MAX_RADIUS,
+                limit.MAX_ITERATIONS.set(Math.max(
-                        newLimit.MAX_RADIUS != -1 ? newLimit.MAX_RADIUS : Integer.MAX_VALUE
+                        limit.MAX_ITERATIONS.get(),
-                );
+                        newLimit.MAX_ITERATIONS != -1 ? newLimit.MAX_ITERATIONS : Integer.MAX_VALUE
+                ));
+                limit.MAX_RADIUS = Math.max(limit.MAX_RADIUS, newLimit.MAX_RADIUS != -1 ? newLimit.MAX_RADIUS : Integer.MAX_VALUE);
                 limit.MAX_SUPER_PICKAXE_SIZE = Math.max(
                         limit.MAX_SUPER_PICKAXE_SIZE,
                         newLimit.MAX_SUPER_PICKAXE_SIZE != -1 ? newLimit.MAX_SUPER_PICKAXE_SIZE : Integer.MAX_VALUE

worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/platform/binding/EditSessionHolder.java

@@ -0,0 +1,7 @@
+package com.fastasyncworldedit.core.extension.platform.binding;
+
+import com.sk89q.worldedit.EditSession;
+
+public record EditSessionHolder(EditSession session) {
+
+}

worldedit-core/src/main/java/com/fastasyncworldedit/core/extension/platform/binding/ProvideBindings.java

@@ -3,7 +3,11 @@ package com.fastasyncworldedit.core.extension.platform.binding;
 import com.fastasyncworldedit.core.configuration.Caption;
 import com.fastasyncworldedit.core.database.DBHandler;
 import com.fastasyncworldedit.core.database.RollbackDatabase;
+import com.fastasyncworldedit.core.extent.LimitExtent;
+import com.fastasyncworldedit.core.extent.processor.ExtentBatchProcessorHolder;
+import com.fastasyncworldedit.core.internal.exception.FaweException;
 import com.fastasyncworldedit.core.regions.FaweMaskManager;
+import com.fastasyncworldedit.core.util.ExtentTraverser;
 import com.fastasyncworldedit.core.util.TextureUtil;
 import com.fastasyncworldedit.core.util.image.ImageUtil;
 import com.sk89q.worldedit.EditSession;
@@ -11,6 +15,7 @@ import com.sk89q.worldedit.LocalSession;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.command.argument.Arguments;
 import com.sk89q.worldedit.command.util.annotation.AllowedRegion;
+import com.sk89q.worldedit.command.util.annotation.SynchronousSettingExpected;
 import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.extension.input.InputParseException;
 import com.sk89q.worldedit.extension.platform.Actor;
@@ -25,6 +30,7 @@ import org.enginehub.piston.inject.Key;
 import org.enginehub.piston.util.ValueProvider;
 
 import java.awt.image.BufferedImage;
+import java.lang.reflect.Method;
 import java.net.URI;
 import java.util.Optional;
 
@@ -52,11 +58,33 @@ public class ProvideBindings extends Bindings {
 
     @Binding
     public EditSession editSession(LocalSession localSession, Actor actor, InjectedValueAccess context) {
+        Method commandMethod =
+                context.injectedValue(Key.of(InjectedValueStore.class)).get().injectedValue(Key.of(Method.class)).get();
+
         Arguments arguments = context.injectedValue(Key.of(Arguments.class)).orElse(null);
         String command = arguments == null ? null : arguments.get();
-        EditSession editSession = localSession.createEditSession(actor, command);
+        boolean synchronousSetting = commandMethod.getAnnotation(SynchronousSettingExpected.class) != null;
-        editSession.enableStandardMode();
+        EditSessionHolder holder = context.injectedValue(Key.of(EditSessionHolder.class)).orElse(null);
-        Request.request().setEditSession(editSession);
+        EditSession editSession = holder != null ? holder.session() : null;
+        if (editSession == null) {
+            editSession = localSession.createEditSession(actor, command);
+            editSession.enableStandardMode();
+        } else {
+            LimitExtent limitExtent = new ExtentTraverser<>(editSession).findAndGet(LimitExtent.class);
+            if (limitExtent != null) {
+                limitExtent.setProcessing(!synchronousSetting);
+                if (!synchronousSetting) {
+                    ExtentBatchProcessorHolder processorHolder = new ExtentTraverser<>(editSession).findAndGet(
+                            ExtentBatchProcessorHolder.class);
+                    if (processorHolder != null) {
+                        processorHolder.addProcessor(limitExtent);
+                    } else {
+                        throw new FaweException(Caption.of("fawe.error.no-process-non-synchronous-edit"));
+                    }
+                }
+            }
+            Request.request().setEditSession(editSession);
+        }
         return editSession;
     }
 

worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/LimitExtent.java

@@ -1,11 +1,15 @@
 package com.fastasyncworldedit.core.extent;
 
 import com.fastasyncworldedit.core.extent.filter.block.ExtentFilterBlock;
-import com.fastasyncworldedit.core.function.generator.GenBase;
+import com.fastasyncworldedit.core.extent.processor.ProcessorScope;
-import com.fastasyncworldedit.core.function.generator.Resource;
 import com.fastasyncworldedit.core.internal.exception.FaweException;
 import com.fastasyncworldedit.core.limit.FaweLimit;
 import com.fastasyncworldedit.core.queue.Filter;
+import com.fastasyncworldedit.core.queue.IBatchProcessor;
+import com.fastasyncworldedit.core.queue.IChunk;
+import com.fastasyncworldedit.core.queue.IChunkGet;
+import com.fastasyncworldedit.core.queue.IChunkSet;
+import com.fastasyncworldedit.core.util.ExtentTraverser;
 import com.sk89q.jnbt.CompoundTag;
 import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.WorldEditException;
@@ -17,7 +21,6 @@ import com.sk89q.worldedit.function.mask.Mask;
 import com.sk89q.worldedit.function.pattern.Pattern;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.regions.Region;
-import com.sk89q.worldedit.session.ClipboardHolder;
 import com.sk89q.worldedit.util.Countable;
 import com.sk89q.worldedit.util.Location;
 import com.sk89q.worldedit.util.formatting.text.Component;
@@ -37,18 +40,22 @@ import java.util.Set;
 import java.util.UUID;
 import java.util.function.Consumer;
 
-public class LimitExtent extends AbstractDelegateExtent {
+public class LimitExtent extends AbstractDelegateExtent implements IBatchProcessor {
 
     private final FaweLimit limit;
     private final boolean[] faweExceptionReasonsUsed = new boolean[FaweException.Type.values().length];
     private final Consumer<Component> onErrorMessage;
+    private final int chunk_size;
+    private boolean processing;
 
     /**
      * Create a new instance.
      *
      * @param extent the extent
      * @param limit  the limit
+     * @deprecated Use {@link LimitExtent#LimitExtent(Extent, FaweLimit, Consumer, boolean)}
      */
+    @Deprecated(forRemoval = true, since = "TODO")
     public LimitExtent(Extent extent, FaweLimit limit) {
         this(extent, limit, c -> {
         });
@@ -60,11 +67,33 @@ public class LimitExtent extends AbstractDelegateExtent {
      * @param extent         the extent
      * @param limit          the limit
      * @param onErrorMessage consumer to handle a component generated by exceptions
+     * @deprecated Use {@link LimitExtent#LimitExtent(Extent, FaweLimit, Consumer, boolean)}
      */
+    @Deprecated(forRemoval = true, since = "TODO")
     public LimitExtent(Extent extent, FaweLimit limit, Consumer<Component> onErrorMessage) {
+        this(extent, limit, onErrorMessage, false);
+    }
+
+    /**
+     * Create a new instance.
+     *
+     * @param extent                   the extent
+     * @param limit                    the limit
+     * @param onErrorMessage           consumer to handle a component generated by exceptions
+     * @param processing               if this limit extent is expected to be processing
+     * @since TODO
+     */
+    public LimitExtent(
+            Extent extent,
+            FaweLimit limit,
+            Consumer<Component> onErrorMessage,
+            boolean processing
+    ) {
         super(extent);
         this.limit = limit;
         this.onErrorMessage = onErrorMessage;
+        this.chunk_size = 16 * 16 * (extent.getMaxY() - extent.getMinY());
+        this.processing = processing;
     }
 
     private void handleException(FaweException e) {
@@ -81,7 +110,7 @@ public class LimitExtent extends AbstractDelegateExtent {
     public List<? extends Entity> getEntities(Region region) {
         limit.THROW_MAX_CHECKS(region.getVolume());
         try {
-            return super.getEntities(region);
+            return extent.getEntities(region);
         } catch (FaweException e) {
             handleException(e);
             return Collections.emptyList();
@@ -92,7 +121,7 @@ public class LimitExtent extends AbstractDelegateExtent {
     public List<? extends Entity> getEntities() {
         limit.THROW_MAX_CHECKS();
         try {
-            return super.getEntities();
+            return extent.getEntities();
         } catch (FaweException e) {
             handleException(e);
             return Collections.emptyList();
@@ -105,7 +134,7 @@ public class LimitExtent extends AbstractDelegateExtent {
         limit.THROW_MAX_CHANGES();
         limit.THROW_MAX_ENTITIES();
         try {
-            return super.createEntity(location, entity);
+            return extent.createEntity(location, entity);
         } catch (FaweException e) {
             handleException(e);
             return null;
@@ -118,7 +147,7 @@ public class LimitExtent extends AbstractDelegateExtent {
         limit.THROW_MAX_CHANGES();
         limit.THROW_MAX_ENTITIES();
         try {
-            return super.createEntity(location, entity, uuid);
+            return extent.createEntity(location, entity, uuid);
         } catch (FaweException e) {
             handleException(e);
             return null;
@@ -130,7 +159,7 @@ public class LimitExtent extends AbstractDelegateExtent {
         limit.THROW_MAX_CHANGES();
         limit.THROW_MAX_ENTITIES();
         try {
-            super.removeEntity(x, y, z, uuid);
+            extent.removeEntity(x, y, z, uuid);
         } catch (FaweException e) {
             handleException(e);
         }
@@ -138,9 +167,9 @@ public class LimitExtent extends AbstractDelegateExtent {
 
     @Override
     public boolean regenerateChunk(int x, int z, @Nullable BiomeType type, @Nullable Long seed) {
-        limit.THROW_MAX_CHANGES(Character.MAX_VALUE);
+        limit.THROW_MAX_CHANGES(chunk_size);
         try {
-            return super.regenerateChunk(x, z, type, seed);
+            return extent.regenerateChunk(x, z, type, seed);
         } catch (FaweException e) {
             handleException(e);
             return false;
@@ -151,7 +180,7 @@ public class LimitExtent extends AbstractDelegateExtent {
     public int getHighestTerrainBlock(int x, int z, int minY, int maxY) {
         limit.THROW_MAX_CHECKS(maxY - minY + 1);
         try {
-            return super.getHighestTerrainBlock(x, z, minY, maxY);
+            return extent.getHighestTerrainBlock(x, z, minY, maxY);
         } catch (FaweException e) {
             handleException(e);
             return minY;
@@ -162,7 +191,7 @@ public class LimitExtent extends AbstractDelegateExtent {
     public int getHighestTerrainBlock(int x, int z, int minY, int maxY, Mask filter) {
         limit.THROW_MAX_CHECKS(maxY - minY + 1);
         try {
-            return super.getHighestTerrainBlock(x, z, minY, maxY, filter);
+            return extent.getHighestTerrainBlock(x, z, minY, maxY, filter);
         } catch (FaweException e) {
             handleException(e);
             return minY;
@@ -173,7 +202,7 @@ public class LimitExtent extends AbstractDelegateExtent {
     public int getNearestSurfaceLayer(int x, int z, int y, int minY, int maxY) {
         limit.THROW_MAX_CHECKS(maxY - minY + 1);
         try {
-            return super.getNearestSurfaceLayer(x, z, y, minY, maxY);
+            return extent.getNearestSurfaceLayer(x, z, y, minY, maxY);
         } catch (FaweException e) {
             handleException(e);
             return minY;
@@ -184,7 +213,7 @@ public class LimitExtent extends AbstractDelegateExtent {
     public int getNearestSurfaceTerrainBlock(int x, int z, int y, int minY, int maxY, boolean ignoreAir) {
         limit.THROW_MAX_CHECKS(maxY - minY + 1);
         try {
-            return super.getNearestSurfaceTerrainBlock(x, z, y, minY, maxY, ignoreAir);
+            return extent.getNearestSurfaceTerrainBlock(x, z, y, minY, maxY, ignoreAir);
         } catch (FaweException e) {
             handleException(e);
             return minY;
@@ -195,7 +224,7 @@ public class LimitExtent extends AbstractDelegateExtent {
     public int getNearestSurfaceTerrainBlock(int x, int z, int y, int minY, int maxY) {
         limit.THROW_MAX_CHECKS(maxY - minY + 1);
         try {
-            return super.getNearestSurfaceTerrainBlock(x, z, y, minY, maxY);
+            return extent.getNearestSurfaceTerrainBlock(x, z, y, minY, maxY);
         } catch (FaweException e) {
             handleException(e);
             return minY;
@@ -206,7 +235,7 @@ public class LimitExtent extends AbstractDelegateExtent {
     public int getNearestSurfaceTerrainBlock(int x, int z, int y, int minY, int maxY, int failedMin, int failedMax) {
         limit.THROW_MAX_CHECKS(maxY - minY + 1);
         try {
-            return super.getNearestSurfaceTerrainBlock(x, z, y, minY, maxY, failedMin, failedMax);
+            return extent.getNearestSurfaceTerrainBlock(x, z, y, minY, maxY, failedMin, failedMax);
         } catch (FaweException e) {
             handleException(e);
             return minY;
@@ -217,7 +246,7 @@ public class LimitExtent extends AbstractDelegateExtent {
     public int getNearestSurfaceTerrainBlock(int x, int z, int y, int minY, int maxY, int failedMin, int failedMax, Mask mask) {
         limit.THROW_MAX_CHECKS(maxY - minY + 1);
         try {
-            return super.getNearestSurfaceTerrainBlock(x, z, y, minY, maxY, failedMin, failedMax, mask);
+            return extent.getNearestSurfaceTerrainBlock(x, z, y, minY, maxY, failedMin, failedMax, mask);
         } catch (FaweException e) {
             handleException(e);
             return minY;
@@ -237,91 +266,47 @@ public class LimitExtent extends AbstractDelegateExtent {
     ) {
         limit.THROW_MAX_CHECKS(maxY - minY + 1);
         try {
-            return super.getNearestSurfaceTerrainBlock(x, z, y, minY, maxY, failedMin, failedMax, ignoreAir);
+            return extent.getNearestSurfaceTerrainBlock(x, z, y, minY, maxY, failedMin, failedMax, ignoreAir);
         } catch (FaweException e) {
             handleException(e);
             return minY;
         }
     }
 
-    @Override
-    public void addCaves(Region region) throws WorldEditException {
-        limit.THROW_MAX_CHECKS(region.getVolume());
-        limit.THROW_MAX_CHANGES(region.getVolume());
-        super.addCaves(region);
-    }
-
-    @Override
-    public void generate(Region region, GenBase gen) throws WorldEditException {
-        limit.THROW_MAX_CHECKS(region.getVolume());
-        limit.THROW_MAX_CHANGES(region.getVolume());
-        super.generate(region, gen);
-    }
-
-    @Override
-    public void addSchems(Region region, Mask mask, List<ClipboardHolder> clipboards, int rarity, boolean rotate) throws
-            WorldEditException {
-        limit.THROW_MAX_CHECKS(region.getVolume());
-        limit.THROW_MAX_CHANGES(region.getVolume());
-        super.addSchems(region, mask, clipboards, rarity, rotate);
-    }
-
-    @Override
-    public void spawnResource(Region region, Resource gen, int rarity, int frequency) throws WorldEditException {
-        limit.THROW_MAX_CHECKS(region.getVolume());
-        limit.THROW_MAX_CHANGES(region.getVolume());
-        super.spawnResource(region, gen, rarity, frequency);
-    }
-
-    @Override
-    public void addOre(Region region, Mask mask, Pattern material, int size, int frequency, int rarity, int minY, int maxY) throws
-            WorldEditException {
-        limit.THROW_MAX_CHECKS(region.getVolume());
-        limit.THROW_MAX_CHANGES(region.getVolume());
-        super.addOre(region, mask, material, size, frequency, rarity, minY, maxY);
-    }
-
-    @Override
-    public void addOres(Region region, Mask mask) throws WorldEditException {
-        limit.THROW_MAX_CHECKS(region.getVolume());
-        limit.THROW_MAX_CHANGES(region.getVolume());
-        super.addOres(region, mask);
-    }
-
     @Override
     public List<Countable<BlockType>> getBlockDistribution(Region region) {
         limit.THROW_MAX_CHECKS(region.getVolume());
-        return super.getBlockDistribution(region);
+        return extent.getBlockDistribution(region);
     }
 
     @Override
     public List<Countable<BlockState>> getBlockDistributionWithData(Region region) {
         limit.THROW_MAX_CHECKS(region.getVolume());
-        return super.getBlockDistributionWithData(region);
+        return extent.getBlockDistributionWithData(region);
     }
 
     @Override
     public int countBlocks(Region region, Set<BaseBlock> searchBlocks) {
         limit.THROW_MAX_CHECKS(region.getVolume());
-        return super.countBlocks(region, searchBlocks);
+        return extent.countBlocks(region, searchBlocks);
     }
 
     @Override
     public int countBlocks(Region region, Mask searchMask) {
         limit.THROW_MAX_CHECKS(region.getVolume());
-        return super.countBlocks(region, searchMask);
+        return extent.countBlocks(region, searchMask);
     }
 
     @Override
     public <B extends BlockStateHolder<B>> int setBlocks(Region region, B block) throws MaxChangedBlocksException {
         limit.THROW_MAX_CHANGES(region.getVolume());
-        return super.setBlocks(region, block);
+        return extent.setBlocks(region, block);
     }
 
     @Override
     public int setBlocks(Region region, Pattern pattern) throws MaxChangedBlocksException {
         limit.THROW_MAX_CHANGES(region.getVolume());
-        return super.setBlocks(region, pattern);
+        return extent.setBlocks(region, pattern);
     }
 
     @Override
@@ -329,41 +314,34 @@ public class LimitExtent extends AbstractDelegateExtent {
             MaxChangedBlocksException {
         limit.THROW_MAX_CHECKS(region.getVolume());
         limit.THROW_MAX_CHANGES(region.getVolume());
-        return super.replaceBlocks(region, filter, replacement);
+        return extent.replaceBlocks(region, filter, replacement);
     }
 
     @Override
     public int replaceBlocks(Region region, Set<BaseBlock> filter, Pattern pattern) throws MaxChangedBlocksException {
         limit.THROW_MAX_CHECKS(region.getVolume());
         limit.THROW_MAX_CHANGES(region.getVolume());
-        return super.replaceBlocks(region, filter, pattern);
+        return extent.replaceBlocks(region, filter, pattern);
     }
 
     @Override
     public int replaceBlocks(Region region, Mask mask, Pattern pattern) throws MaxChangedBlocksException {
         limit.THROW_MAX_CHECKS(region.getVolume());
         limit.THROW_MAX_CHANGES(region.getVolume());
-        return super.replaceBlocks(region, mask, pattern);
+        return extent.replaceBlocks(region, mask, pattern);
-    }
-
-    @Override
-    public int center(Region region, Pattern pattern) throws MaxChangedBlocksException {
-        limit.THROW_MAX_CHECKS(region.getVolume());
-        limit.THROW_MAX_CHANGES(region.getVolume());
-        return super.center(region, pattern);
     }
 
     @Override
     public int setBlocks(Set<BlockVector3> vset, Pattern pattern) {
         limit.THROW_MAX_CHANGES(vset.size());
-        return super.setBlocks(vset, pattern);
+        return extent.setBlocks(vset, pattern);
     }
 
     @Override
     public <T extends Filter> T apply(Region region, T filter, boolean full) {
         limit.THROW_MAX_CHECKS(region.getVolume());
         limit.THROW_MAX_CHANGES(region.getVolume());
-        return super.apply(region, filter, full);
+        return extent.apply(region, filter, full);
     }
 
     @Override
@@ -393,14 +371,14 @@ public class LimitExtent extends AbstractDelegateExtent {
         }
         limit.THROW_MAX_CHECKS(size);
         limit.THROW_MAX_CHANGES(size);
-        return super.apply(positions, filter);
+        return extent.apply(positions, filter);
     }
 
     @Override
     public BlockState getBlock(BlockVector3 position) {
         limit.THROW_MAX_CHECKS();
         try {
-            return super.getBlock(position);
+            return extent.getBlock(position);
         } catch (FaweException e) {
             handleException(e);
             return BlockTypes.AIR.getDefaultState();
@@ -411,7 +389,7 @@ public class LimitExtent extends AbstractDelegateExtent {
     public BlockState getBlock(int x, int y, int z) {
         limit.THROW_MAX_CHECKS();
         try {
-            return super.getBlock(x, y, z);
+            return extent.getBlock(x, y, z);
         } catch (FaweException e) {
             handleException(e);
             return BlockTypes.AIR.getDefaultState();
@@ -422,7 +400,7 @@ public class LimitExtent extends AbstractDelegateExtent {
     public BaseBlock getFullBlock(BlockVector3 position) {
         limit.THROW_MAX_CHECKS();
         try {
-            return super.getFullBlock(position);
+            return extent.getFullBlock(position);
         } catch (FaweException e) {
             handleException(e);
             return BlockTypes.AIR.getDefaultState().toBaseBlock();
@@ -433,7 +411,7 @@ public class LimitExtent extends AbstractDelegateExtent {
     public BaseBlock getFullBlock(int x, int y, int z) {
         limit.THROW_MAX_CHECKS();
         try {
-            return super.getFullBlock(x, y, z);
+            return extent.getFullBlock(x, y, z);
         } catch (FaweException e) {
             handleException(e);
             return BlockTypes.AIR.getDefaultState().toBaseBlock();
@@ -444,7 +422,7 @@ public class LimitExtent extends AbstractDelegateExtent {
     public BiomeType getBiome(BlockVector3 position) {
         limit.THROW_MAX_CHECKS();
         try {
-            return super.getBiome(position);
+            return extent.getBiome(position);
         } catch (FaweException e) {
             handleException(e);
             return BiomeTypes.FOREST;
@@ -455,7 +433,7 @@ public class LimitExtent extends AbstractDelegateExtent {
     public BiomeType getBiomeType(int x, int y, int z) {
         limit.THROW_MAX_CHECKS();
         try {
-            return super.getBiomeType(x, y, z);
+            return extent.getBiomeType(x, y, z);
         } catch (FaweException e) {
             handleException(e);
             return BiomeTypes.FOREST;
@@ -470,7 +448,7 @@ public class LimitExtent extends AbstractDelegateExtent {
             limit.THROW_MAX_BLOCKSTATES();
         }
         try {
-            return super.setBlock(position, block);
+            return extent.setBlock(position, block);
         } catch (FaweException e) {
             handleException(e);
             return false;
@@ -484,7 +462,7 @@ public class LimitExtent extends AbstractDelegateExtent {
             limit.THROW_MAX_BLOCKSTATES();
         }
         try {
-            return super.setBlock(x, y, z, block);
+            return extent.setBlock(x, y, z, block);
         } catch (FaweException e) {
             handleException(e);
             return false;
@@ -494,9 +472,9 @@ public class LimitExtent extends AbstractDelegateExtent {
     @Override
     public boolean setTile(int x, int y, int z, CompoundTag tile) throws WorldEditException {
         limit.THROW_MAX_CHANGES();
-        limit.MAX_BLOCKSTATES();
+        limit.THROW_MAX_BLOCKSTATES();
         try {
-            return super.setTile(x, y, z, tile);
+            return extent.setTile(x, y, z, tile);
         } catch (FaweException e) {
             handleException(e);
             return false;
@@ -507,7 +485,7 @@ public class LimitExtent extends AbstractDelegateExtent {
     public boolean setBiome(BlockVector3 position, BiomeType biome) {
         limit.THROW_MAX_CHANGES();
         try {
-            return super.setBiome(position, biome);
+            return extent.setBiome(position, biome);
         } catch (FaweException e) {
             handleException(e);
             return false;
@@ -518,11 +496,41 @@ public class LimitExtent extends AbstractDelegateExtent {
     public boolean setBiome(int x, int y, int z, BiomeType biome) {
         limit.THROW_MAX_CHANGES();
         try {
-            return super.setBiome(x, y, z, biome);
+            return extent.setBiome(x, y, z, biome);
         } catch (FaweException e) {
             handleException(e);
             return false;
         }
     }
 
+    public void setProcessing(boolean processing) {
+        this.processing = processing;
+    }
+
+    @Override
+    public IChunkSet processSet(IChunk chunk, IChunkGet get, IChunkSet set) {
+        if (!processing) {
+            return set;
+        }
+        int tiles = set.getTiles().size();
+        int ents = set.getEntities().size() + set.getEntityRemoves().size();
+        limit.THROW_MAX_CHANGES(tiles + ents);
+        limit.THROW_MAX_BLOCKSTATES(tiles);
+        limit.THROW_MAX_ENTITIES(ents);
+        return set;
+    }
+
+    @Override
+    public Extent construct(final Extent child) {
+        if (extent != child) {
+            new ExtentTraverser<Extent>(this).setNext(child);
+        }
+        return this;
+    }
+
+    @Override
+    public ProcessorScope getScope() {
+        return ProcessorScope.READING_SET_BLOCKS;
+    }
+
 }

worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/filter/block/CharFilterBlock.java

@@ -9,7 +9,6 @@ import com.fastasyncworldedit.core.queue.IChunkGet;
 import com.fastasyncworldedit.core.queue.IChunkSet;
 import com.fastasyncworldedit.core.queue.implementation.Flood;
 import com.fastasyncworldedit.core.queue.implementation.blocks.CharGetBlocks;
-import com.sk89q.jnbt.CompoundTag;
 import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.math.BlockVector3;

worldedit-core/src/main/java/com/fastasyncworldedit/core/function/mask/ABlockMask.java

@@ -26,7 +26,7 @@ public abstract class ABlockMask extends AbstractExtentMask {
 
     @Override
     public boolean test(BlockVector3 vector) {
-        return test(getExtent().getBlock(vector));
+        return test(vector.getBlock(getExtent()));
     }
 
     public abstract boolean test(BlockState state);

worldedit-core/src/main/java/com/fastasyncworldedit/core/function/mask/DataMask.java

@@ -16,9 +16,9 @@ public class DataMask extends AbstractExtentMask implements ResettableMask {
     @Override
     public boolean test(BlockVector3 vector) {
         if (data != -1) {
-            return getExtent().getBlock(vector).getInternalPropertiesId() == data;
+            return vector.getBlock(getExtent()).getInternalPropertiesId() == data;
         } else {
-            data = getExtent().getBlock(vector).getInternalPropertiesId();
+            data = vector.getBlock(getExtent()).getInternalPropertiesId();
             return true;
         }
     }

worldedit-core/src/main/java/com/fastasyncworldedit/core/function/mask/IdMask.java

@@ -24,7 +24,9 @@ public class IdMask extends AbstractExtentMask implements ResettableMask {
 
     @Override
     public boolean test(BlockVector3 vector) {
-        return test(getExtent(), vector);
+        int blockID = vector.getBlock(getExtent()).getInternalBlockTypeId();
+        int testId = id.compareAndExchange(-1, blockID);
+        return blockID == testId || testId == -1;
     }
 
     @Override

worldedit-core/src/main/java/com/fastasyncworldedit/core/function/mask/SingleBlockStateMask.java

@@ -30,7 +30,7 @@ public class SingleBlockStateMask extends ABlockMask {
 
     @Override
     public boolean test(BlockVector3 vector) {
-        int test = getExtent().getBlock(vector).getOrdinal();
+        int test = vector.getBlock(getExtent()).getOrdinal();
         return ordinal == test || isAir && test == 0;
     }
 

worldedit-core/src/main/java/com/fastasyncworldedit/core/function/mask/SplatterBrushMask.java

@@ -40,7 +40,7 @@ public class SplatterBrushMask extends AbstractExtentMask {
         double dist = vector.distanceSq(position);
         synchronized (placed) {
             if (dist < size2 && !placed.contains(vector) && ThreadLocalRandom.current().nextInt(5) < 2 && surface.test(vector)) {
-                placed.add(vector);
+                placed.add(vector.toImmutable());
                 return true;
             }
         }

worldedit-core/src/main/java/com/fastasyncworldedit/core/limit/FaweLimit.java

@@ -5,16 +5,18 @@ import com.fastasyncworldedit.core.configuration.Settings;
 
 import java.util.Collections;
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
 
 public class FaweLimit {
 
     public int MAX_ACTIONS = 0;
-    public long MAX_CHANGES = 0;
+    public AtomicLong MAX_CHANGES = new AtomicLong();
-    public int MAX_FAILS = 0;
+    public AtomicInteger MAX_FAILS = new AtomicInteger();
-    public long MAX_CHECKS = 0;
+    public AtomicLong MAX_CHECKS = new AtomicLong();
-    public int MAX_ITERATIONS = 0;
+    public AtomicInteger MAX_ITERATIONS = new AtomicInteger();
-    public int MAX_BLOCKSTATES = 0;
+    public AtomicInteger MAX_BLOCKSTATES = new AtomicInteger();
-    public int MAX_ENTITIES = 0;
+    public AtomicInteger MAX_ENTITIES = new AtomicInteger();
     public int MAX_HISTORY = 0;
     public int SCHEM_FILE_SIZE_LIMIT = 0;
     public int SCHEM_FILE_NUM_LIMIT = 0;
@@ -112,12 +114,12 @@ public class FaweLimit {
         MAX.SPEED_REDUCTION = 0;
         MAX.INVENTORY_MODE = 0;
         MAX.MAX_ACTIONS = 1;
-        MAX.MAX_CHANGES = Long.MAX_VALUE;
+        MAX.MAX_CHANGES = new AtomicLong(Long.MAX_VALUE);
-        MAX.MAX_FAILS = Integer.MAX_VALUE;
+        MAX.MAX_FAILS = new AtomicInteger(Integer.MAX_VALUE);
-        MAX.MAX_CHECKS = Long.MAX_VALUE;
+        MAX.MAX_CHECKS = new AtomicLong(Long.MAX_VALUE);
-        MAX.MAX_ITERATIONS = Integer.MAX_VALUE;
+        MAX.MAX_ITERATIONS = new AtomicInteger(Integer.MAX_VALUE);
-        MAX.MAX_BLOCKSTATES = Integer.MAX_VALUE;
+        MAX.MAX_BLOCKSTATES = new AtomicInteger(Integer.MAX_VALUE);
-        MAX.MAX_ENTITIES = Integer.MAX_VALUE;
+        MAX.MAX_ENTITIES = new AtomicInteger(Integer.MAX_VALUE);
         MAX.MAX_HISTORY = Integer.MAX_VALUE;
         MAX.SCHEM_FILE_NUM_LIMIT = Integer.MAX_VALUE;
         MAX.SCHEM_FILE_SIZE_LIMIT = Integer.MAX_VALUE;
@@ -138,120 +140,144 @@ public class FaweLimit {
     }
 
     public boolean MAX_CHANGES() {
-        return MAX_CHANGES-- > 0;
+        return MAX_CHANGES.decrementAndGet() < 0;
     }
 
     public boolean MAX_FAILS() {
-        return MAX_FAILS-- > 0;
+        return MAX_FAILS.decrementAndGet() < 0;
     }
 
     public boolean MAX_CHECKS() {
-        return MAX_CHECKS-- > 0;
+        return MAX_CHECKS.decrementAndGet() < 0;
     }
 
     public boolean MAX_ITERATIONS() {
-        return MAX_ITERATIONS-- > 0;
+        return MAX_ITERATIONS.decrementAndGet() < 0;
     }
 
     public boolean MAX_BLOCKSTATES() {
-        return MAX_BLOCKSTATES-- > 0;
+        return MAX_BLOCKSTATES.decrementAndGet() < 0;
     }
 
     public boolean MAX_ENTITIES() {
-        return MAX_ENTITIES-- > 0;
+        return MAX_ENTITIES.decrementAndGet() < 0;
     }
 
     public void THROW_MAX_CHANGES() {
-        if (MAX_CHANGES-- <= 0) {
+        if (MAX_CHANGES.decrementAndGet() < 0) {
             throw FaweCache.MAX_CHANGES;
         }
     }
 
     public void THROW_MAX_FAILS() {
-        if (MAX_FAILS-- <= 0) {
+        if (MAX_FAILS.decrementAndGet() < 0) {
-            throw FaweCache.MAX_CHECKS;
+            throw FaweCache.MAX_FAILS;
         }
     }
 
     public void THROW_MAX_CHECKS() {
-        if (MAX_CHECKS-- <= 0) {
+        if (MAX_CHECKS.decrementAndGet() < 0) {
             throw FaweCache.MAX_CHECKS;
         }
     }
 
     public void THROW_MAX_ITERATIONS() {
-        if (MAX_ITERATIONS-- <= 0) {
+        if (MAX_ITERATIONS.decrementAndGet() < 0) {
             throw FaweCache.MAX_ITERATIONS;
         }
     }
 
     public void THROW_MAX_BLOCKSTATES() {
-        if (MAX_BLOCKSTATES-- <= 0) {
+        if (MAX_BLOCKSTATES.decrementAndGet() < 0) {
             throw FaweCache.MAX_TILES;
         }
     }
 
     public void THROW_MAX_ENTITIES() {
-        if (MAX_ENTITIES-- <= 0) {
+        if (MAX_ENTITIES.decrementAndGet() < 0) {
             throw FaweCache.MAX_ENTITIES;
         }
     }
 
     public void THROW_MAX_CHANGES(int amt) {
-        if ((MAX_CHANGES -= amt) <= 0) {
+        if (amt == 0) {
+            return;
+        }
+        if (MAX_CHANGES.addAndGet(-amt) < 0) {
             throw FaweCache.MAX_CHANGES;
         }
     }
 
     public void THROW_MAX_CHANGES(long amt) {
-        if ((MAX_CHANGES -= amt) <= 0) {
+        if (amt == 0) {
+            return;
+        }
+        if (MAX_CHANGES.addAndGet(-amt) < 0) {
             throw FaweCache.MAX_CHANGES;
         }
     }
 
     public void THROW_MAX_FAILS(int amt) {
-        if ((MAX_FAILS -= amt) <= 0) {
+        if (amt == 0) {
-            throw FaweCache.MAX_CHECKS;
+            return;
+        }
+        if (MAX_FAILS.addAndGet(-amt) < 0) {
+            throw FaweCache.MAX_FAILS;
         }
     }
 
     public void THROW_MAX_CHECKS(int amt) {
-        if ((MAX_CHECKS -= amt) <= 0) {
+        if (amt == 0) {
+            return;
+        }
+        if (MAX_CHECKS.addAndGet(-amt) < 0) {
             throw FaweCache.MAX_CHECKS;
         }
     }
 
     public void THROW_MAX_CHECKS(long amt) {
-        if ((MAX_CHECKS -= amt) <= 0) {
+        if (amt == 0) {
+            return;
+        }
+        if (MAX_CHECKS.addAndGet(-amt) < 0) {
             throw FaweCache.MAX_CHECKS;
         }
     }
 
     public void THROW_MAX_ITERATIONS(int amt) {
-        if ((MAX_ITERATIONS -= amt) <= 0) {
+        if (amt == 0) {
+            return;
+        }
+        if (MAX_ITERATIONS.addAndGet(-amt) < 0) {
             throw FaweCache.MAX_ITERATIONS;
         }
     }
 
     public void THROW_MAX_BLOCKSTATES(int amt) {
-        if ((MAX_BLOCKSTATES -= amt) <= 0) {
+        if (amt == 0) {
+            return;
+        }
+        if (MAX_BLOCKSTATES.addAndGet(-amt) < 0) {
             throw FaweCache.MAX_TILES;
         }
     }
 
     public void THROW_MAX_ENTITIES(int amt) {
-        if ((MAX_ENTITIES -= amt) <= 0) {
+        if (amt == 0) {
+            return;
+        }
+        if (MAX_ENTITIES.addAndGet(-amt) < 0) {
             throw FaweCache.MAX_ENTITIES;
         }
     }
 
     public boolean isUnlimited() {
-        return MAX_CHANGES == Long.MAX_VALUE
+        return MAX_CHANGES.get() == Long.MAX_VALUE
-                && MAX_FAILS == Integer.MAX_VALUE
+                && MAX_FAILS.get() == Integer.MAX_VALUE
-                && MAX_CHECKS == Long.MAX_VALUE
+                && MAX_CHECKS.get() == Long.MAX_VALUE
-                && MAX_ITERATIONS == Integer.MAX_VALUE
+                && MAX_ITERATIONS.get() == Integer.MAX_VALUE
-                && MAX_BLOCKSTATES == Integer.MAX_VALUE
+                && MAX_BLOCKSTATES.get() == Integer.MAX_VALUE
-                && MAX_ENTITIES == Integer.MAX_VALUE
+                && MAX_ENTITIES.get() == Integer.MAX_VALUE
                 && MAX_HISTORY == Integer.MAX_VALUE
                 && SCHEM_FILE_SIZE_LIMIT == Integer.MAX_VALUE
                 && SCHEM_FILE_NUM_LIMIT == Integer.MAX_VALUE
@@ -270,14 +296,30 @@ public class FaweLimit {
                 && MAX_BUTCHER_RADIUS == Integer.MAX_VALUE;
     }
 
+    /**
+     * Get an {@link FaweLimit} representing the amount of a limit used from a given "original" limit
+     *
+     * @since TODO
+     */
+    public FaweLimit getLimitUsed(FaweLimit originalLimit) {
+        FaweLimit newLimit = new FaweLimit();
+        newLimit.MAX_CHANGES = new AtomicLong(originalLimit.MAX_CHANGES.get() - this.MAX_CHANGES.get());
+        newLimit.MAX_FAILS = new AtomicInteger(originalLimit.MAX_FAILS.get() - this.MAX_FAILS.get());
+        newLimit.MAX_CHECKS = new AtomicLong(originalLimit.MAX_CHECKS.get() - this.MAX_CHECKS.get());
+        newLimit.MAX_ITERATIONS = new AtomicInteger(originalLimit.MAX_ITERATIONS.get() - this.MAX_ITERATIONS.get());
+        newLimit.MAX_BLOCKSTATES = new AtomicInteger(originalLimit.MAX_BLOCKSTATES.get() - this.MAX_BLOCKSTATES.get());
+        newLimit.MAX_ENTITIES = new AtomicInteger(originalLimit.MAX_ENTITIES.get() - this.MAX_ENTITIES.get());
+        return newLimit;
+    }
+
     public void set(FaweLimit limit) {
         MAX_ACTIONS = limit.MAX_ACTIONS;
-        MAX_CHANGES = limit.MAX_CHANGES;
+        MAX_CHANGES.set(limit.MAX_CHANGES.get());
-        MAX_BLOCKSTATES = limit.MAX_BLOCKSTATES;
+        MAX_FAILS.set(limit.MAX_FAILS.get());
-        MAX_CHECKS = limit.MAX_CHECKS;
+        MAX_CHECKS.set(limit.MAX_CHECKS.get());
-        MAX_ENTITIES = limit.MAX_ENTITIES;
+        MAX_ITERATIONS.set(limit.MAX_ITERATIONS.get());
-        MAX_FAILS = limit.MAX_FAILS;
+        MAX_BLOCKSTATES.set(limit.MAX_BLOCKSTATES.get());
-        MAX_ITERATIONS = limit.MAX_ITERATIONS;
+        MAX_ENTITIES.set(limit.MAX_ENTITIES.get());
         MAX_HISTORY = limit.MAX_HISTORY;
         SCHEM_FILE_NUM_LIMIT = limit.SCHEM_FILE_NUM_LIMIT;
         SCHEM_FILE_SIZE_LIMIT = limit.SCHEM_FILE_SIZE_LIMIT;

worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/IBatchProcessor.java

@@ -50,7 +50,7 @@ public interface IBatchProcessor {
     }
 
     /**
-     * Convert this processor into an Extent based processor instead of a queue batch based on.
+     * Convert this processor into an Extent based processor instead of a queue batch based one.
      */
     @Nullable
     Extent construct(Extent child);

worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java

@@ -308,16 +308,7 @@ public class EditSession extends PassthroughExtent implements AutoCloseable {
      * @return Limit remaining
      */
     public FaweLimit getLimitUsed() {
-        FaweLimit newLimit = new FaweLimit();
+        return originalLimit.getLimitUsed(limit);
-        newLimit.MAX_ACTIONS = originalLimit.MAX_ACTIONS - limit.MAX_ACTIONS;
-        newLimit.MAX_CHANGES = originalLimit.MAX_CHANGES - limit.MAX_CHANGES;
-        newLimit.MAX_FAILS = originalLimit.MAX_FAILS - limit.MAX_FAILS;
-        newLimit.MAX_CHECKS = originalLimit.MAX_CHECKS - limit.MAX_CHECKS;
-        newLimit.MAX_ITERATIONS = originalLimit.MAX_ITERATIONS - limit.MAX_ITERATIONS;
-        newLimit.MAX_BLOCKSTATES = originalLimit.MAX_BLOCKSTATES - limit.MAX_BLOCKSTATES;
-        newLimit.MAX_ENTITIES = originalLimit.MAX_ENTITIES - limit.MAX_ENTITIES;
-        newLimit.MAX_HISTORY = limit.MAX_HISTORY;
-        return newLimit;
     }
 
     /**
@@ -472,7 +463,7 @@ public class EditSession extends PassthroughExtent implements AutoCloseable {
      */
     @Deprecated
     public long getBlockChangeLimit() {
-        return originalLimit.MAX_CHANGES;
+        return originalLimit.MAX_CHANGES.get();
     }
 
     /**
@@ -481,7 +472,7 @@ public class EditSession extends PassthroughExtent implements AutoCloseable {
      * @param limit the limit (>= 0) or -1 for no limit
      */
     public void setBlockChangeLimit(long limit) {
-        this.limit.MAX_CHANGES = limit;
+        this.limit.MAX_CHANGES.set(limit);
     }
 
     /**
@@ -1293,8 +1284,8 @@ public class EditSession extends PassthroughExtent implements AutoCloseable {
         Operations.completeBlindly(commit());
         // Check fails
         FaweLimit used = getLimitUsed();
-        if (used.MAX_FAILS > 0) {
+        if (used.MAX_FAILS.get() > 0) {
-            if (used.MAX_CHANGES > 0 || used.MAX_ENTITIES > 0) {
+            if (used.MAX_CHANGES.get() > 0 || used.MAX_ENTITIES.get() > 0) {
                 actor.print(Caption.of("fawe.error.worldedit.some.fails", used.MAX_FAILS));
             } else if (new ExtentTraverser<>(getExtent()).findAndGet(FaweRegionExtent.class) != null) {
                 actor.print(Caption.of("fawe.cancel.reason.outside.region"));

worldedit-core/src/main/java/com/sk89q/worldedit/EditSessionBuilder.java

@@ -635,7 +635,11 @@ public final class EditSessionBuilder {
                 };
             }
             if (limit != null && !limit.isUnlimited()) {
-                this.extent = new LimitExtent(this.extent, limit, onErrorMessage);
+                this.extent = new LimitExtent(this.extent, limit, onErrorMessage, placeChunks && combineStages);
+                // Only process if we're not necessarily going to catch tiles via Extent#setBlock, e.g. because using PQE methods
+                if (placeChunks && combineStages) {
+                    queue.addProcessor((LimitExtent) this.extent);
+                }
             }
             this.extent = wrapExtent(this.extent, eventBus, event, EditSession.Stage.BEFORE_HISTORY);
         }

worldedit-core/src/main/java/com/sk89q/worldedit/LocalSession.java

@@ -1725,6 +1725,7 @@ public class LocalSession implements TextureHolder {
      * @return an edit session
      */
     public EditSession createEditSession(Actor actor) {
+        //FAWE start
         return createEditSession(actor, null);
     }
 
@@ -1739,7 +1740,6 @@ public class LocalSession implements TextureHolder {
         }
 
         // Create an edit session
-        //FAWE start - we don't use the edit session builder yet
         EditSession editSession;
         EditSessionBuilder builder = WorldEdit.getInstance().newEditSessionBuilder().world(world);
         if (actor.isPlayer() && actor instanceof Player) {

worldedit-core/src/main/java/com/sk89q/worldedit/command/BiomeCommands.java

@@ -30,6 +30,7 @@ import com.sk89q.worldedit.command.util.Logging;
 import com.sk89q.worldedit.command.util.WorldEditAsyncCommandBuilder;
 import com.sk89q.worldedit.command.util.annotation.Confirm;
 import com.sk89q.worldedit.command.util.annotation.Preload;
+import com.sk89q.worldedit.command.util.annotation.SynchronousSettingExpected;
 import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.extension.platform.Capability;
@@ -179,6 +180,7 @@ public class BiomeCommands {
     )
     @Logging(REGION)
     @Preload(Preload.PreloadCheck.PRELOAD)
+    @SynchronousSettingExpected // TODO improve using filter/chunk-based-placement
     @Confirm(Confirm.Processor.REGION)
     @CommandPermissions("worldedit.biome.set")
     public void setBiome(

worldedit-core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java

@@ -992,15 +992,15 @@ public class BrushCommands {
                     Expression radius,
             @Arg(desc = "Command to run")
                     List<String> input,
-            @Switch(name = 'p', desc = "Show any printed output")
+            @Switch(name = 'h', desc = "Hide any printed output")
-                    boolean print
+                    boolean hide
     ) throws WorldEditException {
         worldEdit.checkMaxBrushRadius(
                 radius,
                 context.injectedValue(Key.of(Player.class)).orElseThrow(() -> new IllegalStateException("No player"))
         );
         String cmd = StringMan.join(input, " ");
-        set(context, new CommandBrush(cmd, print), "worldedit.brush.command").setSize(radius);
+        set(context, new CommandBrush(cmd, !hide), "worldedit.brush.command").setSize(radius);
     }
 
     @Command(
@@ -1414,7 +1414,7 @@ public class BrushCommands {
 
         //FAWE start
         FaweLimit limit = Settings.settings().getLimit(player);
-        iterations = Math.min(limit.MAX_ITERATIONS, iterations);
+        iterations = Math.min(limit.MAX_ITERATIONS.get(), iterations);
         //FAWE end
 
         set(context, new SmoothBrush(iterations, mask), "worldedit.brush.smooth").setSize(radius);
@@ -1452,7 +1452,7 @@ public class BrushCommands {
 
         //FAWE start
         FaweLimit limit = Settings.settings().getLimit(player);
-        iterations = Math.min(limit.MAX_ITERATIONS, iterations);
+        iterations = Math.min(limit.MAX_ITERATIONS.get(), iterations);
         //FAWE end
 
         set(context, new SnowSmoothBrush(iterations, snowBlockCount, mask), "worldedit.brush.snowsmooth").setSize(radius);

worldedit-core/src/main/java/com/sk89q/worldedit/command/ClipboardCommands.java

@@ -47,6 +47,7 @@ import com.sk89q.worldedit.command.util.CommandPermissionsConditionGenerator;
 import com.sk89q.worldedit.command.util.Logging;
 import com.sk89q.worldedit.command.util.annotation.Confirm;
 import com.sk89q.worldedit.command.util.annotation.Preload;
+import com.sk89q.worldedit.command.util.annotation.SynchronousSettingExpected;
 import com.sk89q.worldedit.entity.Entity;
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.extent.clipboard.BlockArrayClipboard;
@@ -153,7 +154,7 @@ public class ClipboardCommands {
                 ((long) max.x() - (long) min.x() + 1) * ((long) max.y() - (long) min.y() + 1) * ((long) max.z() - (long) min
                         .z() + 1);
         FaweLimit limit = actor.getLimit();
-        if (volume >= limit.MAX_CHECKS) {
+        if (volume >= limit.MAX_CHECKS.get()) {
             throw FaweCache.MAX_CHECKS;
         }
         session.setClipboard(null);
@@ -187,7 +188,7 @@ public class ClipboardCommands {
         long volume = (((long) max.x() - (long) min.x() + 1) * ((long) max.y() - (long) min.y() + 1) * ((long) max.z() - (long) min
                 .z() + 1));
         FaweLimit limit = actor.getLimit();
-        if (volume >= limit.MAX_CHECKS) {
+        if (volume >= limit.MAX_CHECKS.get()) {
             throw FaweCache.MAX_CHECKS;
         }
         session.setClipboard(null);
@@ -260,10 +261,10 @@ public class ClipboardCommands {
         long volume = (((long) max.x() - (long) min.x() + 1) * ((long) max.y() - (long) min.y() + 1) * ((long) max.z() - (long) min
                 .z() + 1));
         FaweLimit limit = actor.getLimit();
-        if (volume >= limit.MAX_CHECKS) {
+        if (volume >= limit.MAX_CHECKS.get()) {
             throw FaweCache.MAX_CHECKS;
         }
-        if (volume >= limit.MAX_CHANGES) {
+        if (volume >= limit.MAX_CHANGES.get()) {
             throw FaweCache.MAX_CHANGES;
         }
         session.setClipboard(null);
@@ -438,6 +439,7 @@ public class ClipboardCommands {
             desc = "Place the clipboard's contents without applying transformations (e.g. rotate)"
     )
     @CommandPermissions("worldedit.clipboard.place")
+    @SynchronousSettingExpected
     @Logging(PLACEMENT)
     public void place(
             Actor actor, World world, LocalSession session, final EditSession editSession,
@@ -502,6 +504,7 @@ public class ClipboardCommands {
             desc = "Paste the clipboard's contents"
     )
     @CommandPermissions("worldedit.clipboard.paste")
+    @SynchronousSettingExpected
     @Logging(PLACEMENT)
     public void paste(
             Actor actor, World world, LocalSession session, EditSession editSession,

worldedit-core/src/main/java/com/sk89q/worldedit/command/GenerationCommands.java

@@ -38,6 +38,7 @@ import com.sk89q.worldedit.command.util.CommandPermissionsConditionGenerator;
 import com.sk89q.worldedit.command.util.Logging;
 import com.sk89q.worldedit.command.util.annotation.Confirm;
 import com.sk89q.worldedit.command.util.annotation.Preload;
+import com.sk89q.worldedit.command.util.annotation.SynchronousSettingExpected;
 import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.function.mask.Mask;
@@ -104,6 +105,7 @@ public class GenerationCommands {
     )
     @CommandPermissions("worldedit.generation.cylinder")
     @Logging(PLACEMENT)
+    @SynchronousSettingExpected
     public int hcyl(
             Actor actor, LocalSession session, EditSession editSession,
             @Arg(desc = "The pattern of blocks to generate")
@@ -152,6 +154,7 @@ public class GenerationCommands {
     )
     @CommandPermissions("worldedit.generation.cylinder")
     @Logging(PLACEMENT)
+    @SynchronousSettingExpected
     public int cyl(
             Actor actor, LocalSession session, EditSession editSession,
             @Arg(desc = "The pattern of blocks to generate")
@@ -197,6 +200,7 @@ public class GenerationCommands {
     )
     @CommandPermissions("worldedit.generation.cone")
     @Logging(PLACEMENT)
+    @SynchronousSettingExpected
     public int cone(Actor actor, LocalSession session, EditSession editSession,
            @Arg(desc = "The pattern of blocks to generate")
                Pattern pattern,
@@ -243,6 +247,7 @@ public class GenerationCommands {
     )
     @CommandPermissions("worldedit.generation.sphere")
     @Logging(PLACEMENT)
+    @SynchronousSettingExpected
     public int hsphere(
             Actor actor, LocalSession session, EditSession editSession,
             @Arg(desc = "The pattern of blocks to generate")
@@ -262,6 +267,7 @@ public class GenerationCommands {
     )
     @CommandPermissions("worldedit.generation.sphere")
     @Logging(PLACEMENT)
+    @SynchronousSettingExpected
     public int sphere(
             Actor actor, LocalSession session, EditSession editSession,
             @Arg(desc = "The pattern of blocks to generate")
@@ -313,6 +319,7 @@ public class GenerationCommands {
     )
     @CommandPermissions("worldedit.generation.forest")
     @Logging(POSITION)
+    @SynchronousSettingExpected
     public int forestGen(
             Actor actor, LocalSession session, EditSession editSession,
             @Arg(desc = "The size of the forest, in blocks", def = "10")
@@ -337,6 +344,7 @@ public class GenerationCommands {
     )
     @CommandPermissions("worldedit.generation.pumpkins")
     @Logging(POSITION)
+    @SynchronousSettingExpected
     public int pumpkins(
             Actor actor, LocalSession session, EditSession editSession,
             @Arg(desc = "The size of the patch", def = "10")
@@ -357,6 +365,7 @@ public class GenerationCommands {
     )
     @CommandPermissions("worldedit.generation.pyramid")
     @Logging(PLACEMENT)
+    @SynchronousSettingExpected
     public int hollowPyramid(
             Actor actor, LocalSession session, EditSession editSession,
             @Arg(desc = "The pattern of blocks to set")
@@ -373,6 +382,7 @@ public class GenerationCommands {
     )
     @CommandPermissions("worldedit.generation.pyramid")
     @Logging(PLACEMENT)
+    @SynchronousSettingExpected
     public int pyramid(
             Actor actor, LocalSession session, EditSession editSession,
             @Arg(desc = "The pattern of blocks to set")
@@ -400,6 +410,7 @@ public class GenerationCommands {
     )
     @CommandPermissions("worldedit.generation.shape")
     @Logging(ALL)
+    @SynchronousSettingExpected
     @Confirm(Confirm.Processor.REGION)
     public int generate(
             Actor actor, LocalSession session, EditSession editSession,
@@ -486,6 +497,7 @@ public class GenerationCommands {
     @CommandPermissions("worldedit.generation.shape.biome")
     @Logging(ALL)
     @Preload(Preload.PreloadCheck.PRELOAD)
+    @SynchronousSettingExpected
     @Confirm(Confirm.Processor.REGION)
     public int generateBiome(
             Actor actor, LocalSession session, EditSession editSession,
@@ -564,6 +576,7 @@ public class GenerationCommands {
     @CommandPermissions("worldedit.generation.caves")
     @Logging(PLACEMENT)
     @Preload(Preload.PreloadCheck.PRELOAD)
+    @SynchronousSettingExpected
     @Confirm(Confirm.Processor.REGION)
     public void caves(
             Actor actor, LocalSession session, EditSession editSession, @Selection Region region,
@@ -602,6 +615,7 @@ public class GenerationCommands {
     @CommandPermissions("worldedit.generation.ore")
     @Logging(PLACEMENT)
     @Preload(Preload.PreloadCheck.PRELOAD)
+    @SynchronousSettingExpected
     @Confirm(Confirm.Processor.REGION)
     public void ores(
             Actor actor,
@@ -621,6 +635,7 @@ public class GenerationCommands {
             desc = "Generate an image"
     )
     @CommandPermissions("worldedit.generation.image")
+    @SynchronousSettingExpected
     @Logging(PLACEMENT)
     public void image(
             Actor actor,
@@ -685,6 +700,7 @@ public class GenerationCommands {
     @CommandPermissions("worldedit.generation.ore")
     @Logging(PLACEMENT)
     @Preload(Preload.PreloadCheck.PRELOAD)
+    @SynchronousSettingExpected
     @Confirm(Confirm.Processor.REGION)
     public void ore(
             Actor actor,
@@ -719,8 +735,9 @@ public class GenerationCommands {
             desc = "Creates a distorted sphere"
     )
     @Logging(PLACEMENT)
+    @SynchronousSettingExpected
     @CommandPermissions("worldedit.generation.blob")
-    public int blobBrush(
+    public int blob(
             Actor actor, LocalSession session, EditSession editSession,
             @Arg(desc = "Pattern")
                     Pattern pattern,

worldedit-core/src/main/java/com/sk89q/worldedit/command/HistoryCommands.java

@@ -27,6 +27,7 @@ import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.command.util.CommandPermissions;
 import com.sk89q.worldedit.command.util.CommandPermissionsConditionGenerator;
 import com.sk89q.worldedit.command.util.annotation.Confirm;
+import com.sk89q.worldedit.command.util.annotation.SynchronousSettingExpected;
 import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.extent.inventory.BlockBag;
@@ -61,6 +62,7 @@ public class HistoryCommands {
             desc = "Undoes the last action (from history)"
     )
     @CommandPermissions({"worldedit.history.undo", "worldedit.history.undo.self"})
+    @SynchronousSettingExpected
     public void undo(
             Actor actor, LocalSession session,
             @Confirm(Confirm.Processor.LIMIT) @Arg(desc = "Number of undoes to perform", def = "1")
@@ -108,6 +110,7 @@ public class HistoryCommands {
             desc = "Redoes the last action (from history)"
     )
     @CommandPermissions({"worldedit.history.redo", "worldedit.history.redo.self"})
+    @SynchronousSettingExpected
     public void redo(
             Actor actor, LocalSession session,
             @Confirm(Confirm.Processor.LIMIT) @Arg(desc = "Number of redoes to perform", def = "1")

worldedit-core/src/main/java/com/sk89q/worldedit/command/RegionCommands.java

@@ -35,6 +35,7 @@ import com.sk89q.worldedit.command.util.CommandPermissionsConditionGenerator;
 import com.sk89q.worldedit.command.util.Logging;
 import com.sk89q.worldedit.command.util.annotation.Confirm;
 import com.sk89q.worldedit.command.util.annotation.Preload;
+import com.sk89q.worldedit.command.util.annotation.SynchronousSettingExpected;
 import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.function.GroundFunction;
@@ -225,6 +226,7 @@ public class RegionCommands {
     )
     @CommandPermissions("worldedit.region.line")
     @Logging(REGION)
+    @SynchronousSettingExpected
     public int line(
             Actor actor, EditSession editSession,
             @Selection Region region,
@@ -257,6 +259,7 @@ public class RegionCommands {
     @CommandPermissions("worldedit.region.curve")
     @Logging(REGION)
     @Confirm(Confirm.Processor.REGION)
+    @SynchronousSettingExpected
     public int curve(
             Actor actor, EditSession editSession,
             @Selection Region region,
@@ -315,6 +318,7 @@ public class RegionCommands {
     @CommandPermissions("worldedit.region.overlay")
     @Logging(REGION)
     @Confirm(Confirm.Processor.REGION)
+    @SynchronousSettingExpected // TODO improve using filter/chunk-based-placement
     public int overlay(
             Actor actor, EditSession editSession, @Selection Region region,
             @Arg(desc = "The pattern of blocks to overlay")
@@ -333,6 +337,7 @@ public class RegionCommands {
     @Logging(REGION)
     @Preload(Preload.PreloadCheck.PRELOAD)
     @Confirm(Confirm.Processor.REGION)
+    @SynchronousSettingExpected // TODO improve using filter/chunk-based-placement
     public void lay(
             Actor actor,
             EditSession editSession,
@@ -369,6 +374,7 @@ public class RegionCommands {
     )
     @Logging(REGION)
     @CommandPermissions("worldedit.region.center")
+    @SynchronousSettingExpected
     public int center(
             Actor actor, EditSession editSession, @Selection Region region,
             @Arg(desc = "The pattern of blocks to set")
@@ -386,6 +392,8 @@ public class RegionCommands {
     @CommandPermissions("worldedit.region.naturalize")
     @Logging(REGION)
     @Confirm(Confirm.Processor.REGION)
+    @SynchronousSettingExpected // TODO improve using filter/chunk-based-placement
+    @Preload(Preload.PreloadCheck.PRELOAD)
     public int naturalize(Actor actor, EditSession editSession, @Selection Region region) throws WorldEditException {
         int affected = editSession.naturalizeCuboidBlocks(region);
         actor.print(Caption.of("worldedit.naturalize.naturalized", TextComponent.of(affected)));
@@ -437,6 +445,7 @@ public class RegionCommands {
     @Logging(REGION)
     @Preload(Preload.PreloadCheck.PRELOAD)
     @Confirm(Confirm.Processor.REGION)
+    @SynchronousSettingExpected
     public int smooth(
             Actor actor, EditSession editSession, @Selection Region region,
             @Arg(desc = "# of iterations to perform", def = "1")
@@ -452,7 +461,7 @@ public class RegionCommands {
         long volume = (((long) max.x() - (long) min.x() + 1) * ((long) max.y() - (long) min.y() + 1) * ((long) max.z() - (long) min
                 .z() + 1));
         FaweLimit limit = actor.getLimit();
-        if (volume >= limit.MAX_CHECKS) {
+        if (volume >= limit.MAX_CHECKS.get()) {
             throw FaweCache.MAX_CHECKS;
         }
         int affected;
@@ -510,6 +519,7 @@ public class RegionCommands {
     @CommandPermissions("worldedit.region.snowsmooth")
     @Logging(REGION)
     @Preload(Preload.PreloadCheck.PRELOAD)
+    @SynchronousSettingExpected
     @Confirm(Confirm.Processor.REGION)
     public int snowSmooth(
             Actor actor, EditSession editSession, @Selection Region region,
@@ -536,6 +546,7 @@ public class RegionCommands {
     @CommandPermissions("worldedit.region.move")
     @Logging(ORIENTATION_REGION)
     @Preload(Preload.PreloadCheck.PRELOAD)
+    @SynchronousSettingExpected
     @Confirm(Confirm.Processor.REGION)
     public int move(
             Actor actor, World world, EditSession editSession, LocalSession session,
@@ -599,6 +610,7 @@ public class RegionCommands {
     @CommandPermissions("worldedit.region.fall")
     @Logging(ORIENTATION_REGION)
     @Preload(Preload.PreloadCheck.PRELOAD)
+    @SynchronousSettingExpected
     @Confirm(Confirm.Processor.REGION)
     public void fall(
             Actor actor, EditSession editSession,
@@ -618,6 +630,7 @@ public class RegionCommands {
     )
     @CommandPermissions("worldedit.region.stack")
     @Preload(Preload.PreloadCheck.PRELOAD)
+    @SynchronousSettingExpected
     @Logging(ORIENTATION_REGION)
     public int stack(
             Actor actor, World world, EditSession editSession, LocalSession session,
@@ -683,6 +696,7 @@ public class RegionCommands {
     )
     @CommandPermissions("worldedit.regen")
     @Logging(REGION)
+    @SynchronousSettingExpected
     @Confirm(Confirm.Processor.REGION)
     void regenerate(
             Actor actor, World world, LocalSession session, EditSession editSession,
@@ -737,6 +751,7 @@ public class RegionCommands {
     @CommandPermissions("worldedit.region.deform")
     @Logging(ALL)
     @Preload(Preload.PreloadCheck.PRELOAD)
+    @SynchronousSettingExpected
     @Confirm(Confirm.Processor.REGION)
     public int deform(
             Actor actor, LocalSession session, EditSession editSession,
@@ -814,6 +829,7 @@ public class RegionCommands {
     @CommandPermissions("worldedit.region.hollow")
     @Logging(REGION)
     @Preload(Preload.PreloadCheck.PRELOAD)
+    @SynchronousSettingExpected
     @Confirm(Confirm.Processor.REGION)
     public int hollow(
             Actor actor, EditSession editSession,
@@ -848,6 +864,7 @@ public class RegionCommands {
     @CommandPermissions("worldedit.region.forest")
     @Logging(REGION)
     @Preload(Preload.PreloadCheck.PRELOAD)
+    @SynchronousSettingExpected
     @Confirm(Confirm.Processor.REGION)
     public int forest(
             Actor actor, EditSession editSession, @Selection Region region,
@@ -869,6 +886,7 @@ public class RegionCommands {
     @CommandPermissions("worldedit.region.flora")
     @Logging(REGION)
     @Preload(Preload.PreloadCheck.PRELOAD)
+    @SynchronousSettingExpected
     @Confirm(Confirm.Processor.REGION)
     public int flora(
             Actor actor, EditSession editSession, @Selection Region region,

worldedit-core/src/main/java/com/sk89q/worldedit/command/SnapshotUtilCommands.java

@@ -28,6 +28,7 @@ import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.command.util.CommandPermissions;
 import com.sk89q.worldedit.command.util.CommandPermissionsConditionGenerator;
 import com.sk89q.worldedit.command.util.Logging;
+import com.sk89q.worldedit.command.util.annotation.SynchronousSettingExpected;
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.regions.Region;
 import com.sk89q.worldedit.util.formatting.text.TextComponent;
@@ -66,6 +67,7 @@ public class SnapshotUtilCommands {
     )
     @Logging(REGION)
     @CommandPermissions("worldedit.snapshots.restore")
+    @SynchronousSettingExpected
     public void restore(
             Actor actor, World world, LocalSession session, EditSession editSession,
             @Arg(name = "snapshot", desc = "The snapshot to restore", def = "")

worldedit-core/src/main/java/com/sk89q/worldedit/command/UtilityCommands.java

@@ -44,6 +44,7 @@ import com.sk89q.worldedit.command.util.EntityRemover;
 import com.sk89q.worldedit.command.util.Logging;
 import com.sk89q.worldedit.command.util.PrintCommandHelp;
 import com.sk89q.worldedit.command.util.WorldEditAsyncCommandBuilder;
+import com.sk89q.worldedit.command.util.annotation.SynchronousSettingExpected;
 import com.sk89q.worldedit.entity.Entity;
 import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.extension.platform.Actor;
@@ -220,6 +221,7 @@ public class UtilityCommands {
     )
     @CommandPermissions("worldedit.fill")
     @Logging(PLACEMENT)
+    @SynchronousSettingExpected
     public int fill(
             Actor actor, LocalSession session, EditSession editSession,
             @Arg(desc = "The blocks to fill with")
@@ -311,6 +313,7 @@ public class UtilityCommands {
     )
     @CommandPermissions("worldedit.fill.recursive")
     @Logging(PLACEMENT)
+    @SynchronousSettingExpected
     public int fillr(
             Actor actor, LocalSession session, EditSession editSession,
             @Arg(desc = "The blocks to fill with")
@@ -343,6 +346,7 @@ public class UtilityCommands {
     )
     @CommandPermissions("worldedit.drain")
     @Logging(PLACEMENT)
+    @SynchronousSettingExpected
     public int drain(
             Actor actor, LocalSession session, EditSession editSession,
             //FAWE start - we take an expression over a double
@@ -373,6 +377,7 @@ public class UtilityCommands {
     )
     @CommandPermissions("worldedit.fixlava")
     @Logging(PLACEMENT)
+    @SynchronousSettingExpected
     public int fixLava(
             Actor actor, LocalSession session, EditSession editSession,
             @Arg(desc = "The radius to fix in")
@@ -394,6 +399,7 @@ public class UtilityCommands {
     )
     @CommandPermissions("worldedit.fixwater")
     @Logging(PLACEMENT)
+    @SynchronousSettingExpected
     public int fixWater(
             Actor actor, LocalSession session, EditSession editSession,
             @Arg(desc = "The radius to fix in")
@@ -415,6 +421,7 @@ public class UtilityCommands {
     )
     @CommandPermissions("worldedit.removeabove")
     @Logging(PLACEMENT)
+    @SynchronousSettingExpected
     public int removeAbove(
             Actor actor, World world, LocalSession session, EditSession editSession,
             @Arg(desc = "The apothem of the square to remove from", def = "1")
@@ -440,6 +447,7 @@ public class UtilityCommands {
     )
     @CommandPermissions("worldedit.removebelow")
     @Logging(PLACEMENT)
+    @SynchronousSettingExpected
     public int removeBelow(
             Actor actor, World world, LocalSession session, EditSession editSession,
             @Arg(desc = "The apothem of the square to remove from", def = "1")
@@ -465,6 +473,7 @@ public class UtilityCommands {
     )
     @CommandPermissions("worldedit.removenear")
     @Logging(PLACEMENT)
+    @SynchronousSettingExpected
     public int removeNear(
             Actor actor, LocalSession session, EditSession editSession,
             @Arg(desc = "The mask of blocks to remove")
@@ -527,6 +536,7 @@ public class UtilityCommands {
     )
     @CommandPermissions("worldedit.snow")
     @Logging(PLACEMENT)
+    @SynchronousSettingExpected
     public int snow(
             Actor actor, LocalSession session, EditSession editSession,
             @Arg(desc = "The radius of the cylinder to snow in", def = "10")
@@ -566,6 +576,7 @@ public class UtilityCommands {
     )
     @CommandPermissions("worldedit.thaw")
     @Logging(PLACEMENT)
+    @SynchronousSettingExpected
     public int thaw(
             Actor actor, LocalSession session, EditSession editSession,
             @Arg(desc = "The radius of the cylinder to thaw in", def = "10")
@@ -595,6 +606,7 @@ public class UtilityCommands {
     )
     @CommandPermissions("worldedit.green")
     @Logging(PLACEMENT)
+    @SynchronousSettingExpected
     public int green(
             Actor actor, LocalSession session, EditSession editSession,
             @Arg(desc = "The radius of the cylinder to convert in", def = "10")
@@ -629,6 +641,7 @@ public class UtilityCommands {
     )
     @CommandPermissions("worldedit.extinguish")
     @Logging(PLACEMENT)
+    @SynchronousSettingExpected
     public int extinguish(
             Actor actor, LocalSession session, EditSession editSession,
             @Arg(desc = "The radius of the square to remove in", def = "")
@@ -843,55 +856,6 @@ public class UtilityCommands {
         }
     }
 
-//    @Command(
-//            name = "/hollowr",
-//            desc = "Hollow out a space recursively with a pattern"
-//    )
-//    @CommandPermissions("worldedit.hollowr")
-//    @Logging(PLACEMENT)
-//    public int hollowr(
-//            Actor actor,
-//            LocalSession session,
-//            EditSession editSession,
-//            @Arg(desc = "The radius to hollow out") Expression radiusExp,
-//            @ArgFlag(name = 'p', desc = "The blocks to fill with") Pattern pattern,
-//            @ArgFlag(name = 'm', desc = "The blocks remove", def = "") Mask mask
-//    ) throws WorldEditException {
-//        //FAWE start
-//        double radius = radiusExp.evaluate();
-//        //FAWE end
-//        radius = Math.max(1, radius);
-//        we.checkMaxRadius(radius);
-//        if (mask == null) {
-//            Mask mask = new MaskIntersection(
-//                    new RegionMask(new EllipsoidRegion(null, origin, Vector3.at(radius, radius, radius))),
-//                    new BoundedHeightMask(
-//                            Math.max(lowerBound, minY),
-//                            Math.min(maxY, origin.getBlockY())
-//                    ),
-//                    Masks.negate(new ExistingBlockMask(this))
-//            );
-//        }
-//
-//        // Want to replace blocks
-//        BlockReplace replace = new BlockReplace(this, pattern);
-//
-//        // Pick how we're going to visit blocks
-//        RecursiveVisitor visitor;
-//        //FAWE start - provide extent for preloading, min/max y
-//        if (recursive) {
-//            visitor = new RecursiveVisitor(mask, replace, (int) (radius * 2 + 1), minY, maxY, this);
-//        } else {
-//            visitor = new DownwardVisitor(mask, replace, origin.getBlockY(), (int) (radius * 2 + 1), minY, maxY, this);
-//        }
-//        //FAWE end
-//
-//        BlockVector3 pos = session.getPlacementPosition(actor);
-//        int affected = editSession.res(pos, pattern, radius, depth, true);
-//        actor.print(Caption.of("worldedit.fillr.created", TextComponent.of(affected)));
-//        return affected;
-//    }
-
     public static List<Map.Entry<URI, String>> filesToEntry(final File root, final List<File> files, final UUID uuid) {
         return files.stream()
                 .map(input -> { // Keep this functional, as transform is evaluated lazily

worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockDataCyler.java

@@ -89,7 +89,7 @@ public class BlockDataCyler implements DoubleActionBlockTool {
                 Property<Object> objProp = (Property<Object>) currentProperty;
                 BaseBlock newBlock = block.with(objProp, currentProperty.getValues().get(index));
 
-                try (EditSession editSession = session.createEditSession(player)) {
+                try (EditSession editSession = session.createEditSession(player, null)) {
                     try {
                         editSession.setBlock(blockPoint, newBlock);
                         player.print(Caption.of(

worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockReplacer.java

@@ -63,7 +63,7 @@ public class BlockReplacer implements DoubleActionBlockTool {
     ) {
         BlockBag bag = session.getBlockBag(player);
 
-        try (EditSession editSession = session.createEditSession(player)) {
+        try (EditSession editSession = session.createEditSession(player, null)) {
             try {
                 BlockVector3 position = clicked.toVector().toBlockPoint();
                 editSession.setBlock(position, pattern);

worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/SinglePickaxe.java

@@ -62,7 +62,7 @@ public class SinglePickaxe implements BlockTool {
             return false;
         }
 
-        try (EditSession editSession = session.createEditSession(player)) {
+        try (EditSession editSession = session.createEditSession(player, null)) {
             try {
                 editSession.getSurvivalExtent().setToolUse(config.superPickaxeDrop);
                 editSession.setBlock(blockPoint, BlockTypes.AIR.getDefaultState());

worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/StackTool.java

@@ -59,7 +59,7 @@ public class StackTool implements BlockTool {
         }
         BlockBag bag = session.getBlockBag(player);
 
-        try (EditSession editSession = session.createEditSession(player)) {
+        try (EditSession editSession = session.createEditSession(player, null)) {
             BlockStateHolder<?> block = editSession.getFullBlock(clicked.toVector().toBlockPoint());
 
             try {

worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/TreePlanter.java

@@ -60,7 +60,7 @@ public class TreePlanter implements BlockTool {
             @Nullable Direction face
     ) {
 
-        try (EditSession editSession = session.createEditSession(player)) {
+        try (EditSession editSession = session.createEditSession(player, null)) {
             try {
                 boolean successful = false;
 

worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/brush/Brush.java

@@ -40,4 +40,15 @@ public interface Brush {
      */
     void build(EditSession editSession, BlockVector3 position, Pattern pattern, double size) throws MaxChangedBlocksException;
 
+    //FAWE start
+    /**
+     * If this brush is expected to set blocks synchronously, i.e. from one thread (at a time)
+     *
+     * @since TODO
+     */
+    default boolean setsSynchronously() {
+        return true;
+    }
+    //FAWE end
+
 }

worldedit-core/src/main/java/com/sk89q/worldedit/command/util/annotation/ConfirmHandler.java

@@ -12,7 +12,7 @@ import java.lang.reflect.Method;
 import java.util.Optional;
 
 /**
- * Logs called commands to a logger.
+ * Handles commands indicated as requiring confirmation.
  */
 public class ConfirmHandler implements CommandCallListener {
 

worldedit-core/src/main/java/com/sk89q/worldedit/command/util/annotation/PreloadHandler.java

@@ -11,7 +11,7 @@ import java.lang.reflect.Method;
 import java.util.Optional;
 
 /**
- * Logs called commands to a logger.
+ * Initialises preloading of chunks.
  */
 public class PreloadHandler implements CommandCallListener {
 

worldedit-core/src/main/java/com/sk89q/worldedit/command/util/annotation/SynchronousSettingExpected.java

@@ -0,0 +1,22 @@
+package com.sk89q.worldedit.command.util.annotation;
+
+import org.enginehub.piston.inject.InjectAnnotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Indicates it is expected that blocks will only be set synchronously, i.e. from one thread (at a time)
+ *
+ * @since TODO
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({
+        ElementType.METHOD
+})
+@InjectAnnotation
+public @interface SynchronousSettingExpected {
+
+}

worldedit-core/src/main/java/com/sk89q/worldedit/command/util/annotation/package-info.java

@@ -8,6 +8,7 @@
  * {@link com.sk89q.worldedit.command.util.annotation.PatternList},
  * {@link com.sk89q.worldedit.command.util.annotation.Preload},
  * {@link com.sk89q.worldedit.command.util.annotation.PreloadHandler},
+ * {@link com.sk89q.worldedit.command.util.annotation.SynchronousSettingExpected},
  * {@link com.sk89q.worldedit.command.util.annotation.Step},
  * {@link com.sk89q.worldedit.command.util.annotation.Time}
  */

worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformCommandManager.java

@@ -24,6 +24,7 @@ import com.fastasyncworldedit.core.configuration.Caption;
 import com.fastasyncworldedit.core.configuration.Settings;
 import com.fastasyncworldedit.core.extension.platform.binding.Bindings;
 import com.fastasyncworldedit.core.extension.platform.binding.ConsumeBindings;
+import com.fastasyncworldedit.core.extension.platform.binding.EditSessionHolder;
 import com.fastasyncworldedit.core.extension.platform.binding.PrimitiveBindings;
 import com.fastasyncworldedit.core.extension.platform.binding.ProvideBindings;
 import com.fastasyncworldedit.core.internal.command.MethodInjector;
@@ -154,7 +155,6 @@ import org.enginehub.piston.inject.MemoizingValueAccess;
 import org.enginehub.piston.inject.MergedValueAccess;
 import org.enginehub.piston.part.SubCommandPart;
 import org.enginehub.piston.suggestion.Suggestion;
-import org.enginehub.piston.util.HelpGenerator;
 import org.enginehub.piston.util.ValueProvider;
 
 import javax.annotation.Nonnull;
@@ -227,7 +227,6 @@ public final class PlatformCommandManager {
                         new ConfirmHandler(),
                         new PreloadHandler()
                         //FAWE end
-
                 ));
         // setup separate from main constructor
         // ensures that everything is definitely assigned
@@ -312,20 +311,6 @@ public final class PlatformCommandManager {
                 }
         );
         //FAWE start
-        /*
-        globalInjectedValues.injectValue(Key.of(EditSession.class),
-                context -> {
-                    LocalSession localSession = context.injectedValue(Key.of(LocalSession.class))
-                            .orElseThrow(() -> new IllegalStateException("No LocalSession"));
-                    return context.injectedValue(Key.of(Actor.class))
-                            .map(actor -> {
-                                EditSession editSession = localSession.createEditSession(actor);
-                                editSession.enableStandardMode();
-                                Request.request().setEditSession(editSession);
-                                return editSession;
-                            });
-                });
-        */
         // TODO: Ping @MattBDev to reimplement 2020-02-04
 //        globalInjectedValues.injectValue(Key.of(CFICommands.CFISettings.class),
 //                context -> context.injectedValue(Key.of(Actor.class))
@@ -866,10 +851,10 @@ public final class PlatformCommandManager {
         store.injectValue(Key.of(InjectedValueStore.class), ValueProvider.constant(store));
         store.injectValue(Key.of(Event.class), ValueProvider.constant(event));
         //FAWE start - allow giving editsessions
-        if (event instanceof CommandEvent) {
+        if (event instanceof CommandEvent commandEvent) {
-            EditSession session = ((CommandEvent) event).getSession();
+            EditSession session = commandEvent.getSession();
             if (session != null) {
-                store.injectValue(Key.of(EditSession.class), context -> Optional.of(session));
+                store.injectValue(Key.of(EditSessionHolder.class), context -> Optional.of(new EditSessionHolder(session)));
             }
         }
         //FAWE end

worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/BiomeMask.java

@@ -94,7 +94,7 @@ public class BiomeMask extends AbstractExtentMask {
 
     @Override
     public boolean test(BlockVector3 vector) {
-        BiomeType biome = getExtent().getBiome(vector);
+        BiomeType biome = vector.getBiome(getExtent());
         return biomes.contains(biome);
     }
 

worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/BlockCategoryMask.java

@@ -46,7 +46,7 @@ public class BlockCategoryMask extends AbstractExtentMask {
 
     @Override
     public boolean test(BlockVector3 vector) {
-        return category.contains(getExtent().getBlock(vector));
+        return category.contains(vector.getBlock(getExtent()));
     }
 
     //FAWE start

worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/BlockMask.java

@@ -204,7 +204,7 @@ public class BlockMask extends ABlockMask {
 
     @Override
     public boolean test(BlockVector3 vector) {
-        int test = getExtent().getBlock(vector).getOrdinal();
+        int test = vector.getBlock(getExtent()).getOrdinal();
         return ordinals[test] || replacesAir() && test == 0;
     }
 

worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/BlockStateMask.java

@@ -56,7 +56,7 @@ public class BlockStateMask extends AbstractExtentMask {
     //FAWE start
     @Override
     public boolean test(BlockVector3 vector) {
-        return test(getExtent().getBlock(vector));
+        return test(vector.getBlock(getExtent()));
     }
 
     @Override

worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/BlockTypeMask.java

@@ -124,7 +124,7 @@ public class BlockTypeMask extends AbstractExtentMask {
     //FAWE start
     @Override
     public boolean test(BlockVector3 vector) {
-        return test(getExtent().getBlock(vector).getBlockType());
+        return test(vector.getBlock(getExtent()).getBlockType());
     }
 
     @Override

worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/ExistingBlockMask.java

@@ -41,7 +41,7 @@ public class ExistingBlockMask extends AbstractExtentMask {
 
     @Override
     public boolean test(BlockVector3 vector) {
-        return !getExtent().getBlock(vector).getBlockType().getMaterial().isAir();
+        return !vector.getBlock(getExtent()).getBlockType().getMaterial().isAir();
     }
 
     @Override

worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/InverseSingleBlockStateMask.java

@@ -29,7 +29,7 @@ public class InverseSingleBlockStateMask extends ABlockMask {
 
     @Override
     public boolean test(BlockVector3 vector) {
-        int test = getExtent().getBlock(vector).getOrdinal();
+        int test = vector.getBlock(getExtent()).getOrdinal();
         if (isAir && test == 0) {
             return false;
         }

worldedit-core/src/main/resources/lang/strings.json

@@ -141,6 +141,7 @@
   "fawe.error.limit.max-brush-radius": "Maximum brush radius in limit: {0}",
   "fawe.error.limit.max-radius": "Maximum radius in limit: {0}",
   "fawe.error.no-valid-on-hotbar": "No valid block types on hotbar",
+  "fawe.error.no-process-non-synchronous-edit": "No processor holder was found but edit is non-synchronous",
   "fawe.cancel.count": "Cancelled {0} edits.",
   "fawe.cancel.reason.confirm": "Use //confirm to execute {0}",
   "fawe.cancel.reason.confirm.region": "Your selection is large ({0} -> {1}, containing {3} blocks). Use //confirm to execute {2}",
@@ -151,6 +152,7 @@
   "fawe.cancel.reason.low.memory": "Low memory",
   "fawe.cancel.reason.max.changes": "Too many blocks changed",
   "fawe.cancel.reason.max.checks": "Too many block checks",
+  "fawe.cancel.reason.max.fails": "Too many fails",
   "fawe.cancel.reason.max.tiles": "Too many block entities",
   "fawe.cancel.reason.max.entities": "Too many entities",
   "fawe.cancel.reason.max.iterations": "Max iterations",