Fixes #1099

core/src/main/java/com/boydti/fawe/object/FawePlayer.java

@@ -29,6 +29,8 @@ import com.sk89q.worldedit.regions.selector.CylinderRegionSelector;
 import com.sk89q.worldedit.session.ClipboardHolder;
 import com.sk89q.worldedit.world.World;
 import com.sk89q.worldedit.world.registry.WorldData;
+
+import javax.annotation.Nullable;
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Field;
@@ -158,61 +160,85 @@ public abstract class FawePlayer<T> extends Metadatable {
         return cancelled;
     }
 
-    public void checkConfirmation(String command, int times, int limit) throws RegionOperationException {
+    private void setConfirmTask(@Nullable WorldEditRunnable task, String command) {
-        if (command == null || getMeta("cmdConfirmRunning", false)) {
+        setMeta("cmdConfirm", task == null ? (WorldEditRunnable) () ->
-            return;
+        CommandManager.getInstance().handleCommandOnCurrentThread(new CommandEvent(getPlayer(), command))
+        : task);
     }
+
+    public void checkConfirmation(@Nullable WorldEditRunnable task, String command, int times, int limit) throws WorldEditException {
+        if (command != null && !getMeta("cmdConfirmRunning", false)) {
             if (times > limit) {
-            setMeta("cmdConfirm", command);
+                setConfirmTask(task, command);
                 String volume = "<unspecified>";
                 throw new RegionOperationException(BBC.WORLDEDIT_CANCEL_REASON_CONFIRM.f(0, times, command, volume));
             }
         }
-
+        if (task != null) task.run();
-    public void checkConfirmationRadius(String command, int radius) throws RegionOperationException {
-        if (command == null || getMeta("cmdConfirmRunning", false)) {
-            return;
     }
+
+    public void checkConfirmationRadius(@Nullable WorldEditRunnable task, String command, int radius) throws WorldEditException {
+        if (command != null && !getMeta("cmdConfirmRunning", false)) {
             if (radius > 0) {
                 if (radius > 448) {
-                setMeta("cmdConfirm", command);
+                    setConfirmTask(task, command);
                     long volume = (long) (Math.PI * ((double) radius * radius));
                     throw new RegionOperationException(BBC.WORLDEDIT_CANCEL_REASON_CONFIRM.f(0, radius, command, NumberFormat.getNumberInstance().format(volume)));
                 }
             }
         }
-
+        if (task != null) task.run();
-    public void checkConfirmationStack(String command, Region region, int times) throws RegionOperationException {
-        if (command == null || getMeta("cmdConfirmRunning", false)) {
-            return;
     }
+
+    public void checkConfirmationStack(@Nullable WorldEditRunnable task, String command, Region region, int times) throws WorldEditException {
+        if (command != null && !getMeta("cmdConfirmRunning", false)) {
             if (region != null) {
                 Vector min = region.getMinimumPoint().toBlockVector();
                 Vector max = region.getMaximumPoint().toBlockVector();
                 long area = (long) ((max.getX() - min.getX()) * (max.getZ() - min.getZ() + 1)) * times;
                 if (area > 2 << 18) {
-                setMeta("cmdConfirm", command);
+                    setConfirmTask(task, command);
                     long volume = (long) max.subtract(min).add(Vector.ONE).volume() * times;
                     throw new RegionOperationException(BBC.WORLDEDIT_CANCEL_REASON_CONFIRM.f(min, max, command, NumberFormat.getNumberInstance().format(volume)));
                 }
             }
         }
-
+        if (task != null) task.run();
-    public void checkConfirmationRegion(String command, Region region) throws RegionOperationException {
-        if (command == null || getMeta("cmdConfirmRunning", false)) {
-            return;
     }
+
+    public void checkConfirmationRegion(@Nullable WorldEditRunnable task, String command, Region region) throws WorldEditException {
+        if (command != null && !getMeta("cmdConfirmRunning", false)) {
             if (region != null) {
                 Vector min = region.getMinimumPoint().toBlockVector();
                 Vector max = region.getMaximumPoint().toBlockVector();
                 long area = (long) ((max.getX() - min.getX()) * (max.getZ() - min.getZ() + 1));
                 if (area > 2 << 18) {
-                setMeta("cmdConfirm", command);
+                    setConfirmTask(task, command);
                     long volume = (long) max.subtract(min).add(Vector.ONE).volume();
                     throw new RegionOperationException(BBC.WORLDEDIT_CANCEL_REASON_CONFIRM.f(min, max, command, NumberFormat.getNumberInstance().format(volume)));
                 }
             }
         }
+        if (task != null) task.run();
+    }
+
+    public synchronized boolean confirm() {
+        WorldEditRunnable confirm = deleteMeta("cmdConfirm");
+        if (!(confirm instanceof Runnable)) {
+            return false;
+        }
+        queueAction(() -> {
+            setMeta("cmdConfirmRunning", true);
+            try {
+                confirm.run();
+            } catch (WorldEditException e) {
+                throw new RuntimeException(e);
+            } finally {
+                setMeta("cmdConfirmRunning", false);
+            }
+        });
+        return true;
+    }
 
     public void checkAllowedRegion(Region wrappedSelection) {
         Region[] allowed = WEManager.IMP.getMask(this, FaweMaskManager.MaskType.OWNER);
@@ -224,20 +250,6 @@ public abstract class FawePlayer<T> extends Metadatable {
         }
     }
 
-    public boolean confirm() {
-        String confirm = deleteMeta("cmdConfirm");
-        if (confirm == null) {
-            return false;
-        }
-        queueAction(() -> {
-            setMeta("cmdConfirmRunning", true);
-            CommandEvent event = new CommandEvent(getPlayer(), confirm);
-            CommandManager.getInstance().handleCommandOnCurrentThread(event);
-            setMeta("cmdConfirmRunning", false);
-        });
-        return true;
-    }
-
     public boolean toggle(String perm) {
         if (this.hasPermission(perm)) {
             this.setPermission(perm, false);

core/src/main/java/com/boydti/fawe/object/WorldEditRunnable.java

@@ -0,0 +1,7 @@
+package com.boydti.fawe.object;
+
+import com.sk89q.worldedit.WorldEditException;
+
+public interface WorldEditRunnable {
+    void run() throws WorldEditException;
+}

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

@@ -152,7 +152,8 @@ public class ClipboardCommands extends MethodCommands {
     public void copy(FawePlayer fp, Player player, LocalSession session, EditSession editSession,
                      @Selection Region region, @Switch('e') boolean skipEntities,
                      @Switch('m') Mask mask, CommandContext context, @Switch('b') boolean copyBiomes) throws WorldEditException {
-        fp.checkConfirmationRegion(getArguments(context), region);
+        Vector pos = session.getPlacementPosition(player);
+        fp.checkConfirmationRegion(() -> {
             Vector min = region.getMinimumPoint();
             Vector max = region.getMaximumPoint();
             long volume = (((long) max.getX() - (long) min.getX() + 1) * ((long) max.getY() - (long) min.getY() + 1) * ((long) max.getZ() - (long) min.getZ() + 1));
@@ -164,7 +165,7 @@ public class ClipboardCommands extends MethodCommands {
             BlockArrayClipboard clipboard = new BlockArrayClipboard(region, player.getUniqueId());
             session.setClipboard(new ClipboardHolder(clipboard, editSession.getWorldData()));
 
-        clipboard.setOrigin(session.getPlacementPosition(player));
+            clipboard.setOrigin(pos);
             ForwardExtentCopy copy = new ForwardExtentCopy(editSession, region, clipboard, region.getMinimumPoint());
             copy.setCopyEntities(!skipEntities);
             copy.setCopyBiomes(copyBiomes);
@@ -177,10 +178,11 @@ public class ClipboardCommands extends MethodCommands {
             if (mask != null && mask != Masks.alwaysTrue()) {
                 copy.setSourceMask(mask);
             }
-        Operations.completeLegacy(copy);
+            Operations.completeBlindly(copy);
             BBC.COMMAND_COPY.send(player, region.getArea());
             if (!FawePlayer.wrap(player).hasPermission("fawe.tips"))
                 BBC.TIP_PASTE.or(BBC.TIP_DOWNLOAD, BBC.TIP_ROTATE, BBC.TIP_COPYPASTE, BBC.TIP_REPLACE_MARKER, BBC.TIP_COPY_PATTERN).send(player);
+        }, getArguments(context), region);
     }
 
     @Command(
@@ -240,7 +242,6 @@ public class ClipboardCommands extends MethodCommands {
     public void cut(FawePlayer fp, Player player, LocalSession session, EditSession editSession,
                     @Selection Region region, @Optional("air") Pattern leavePattern, @Switch('e') boolean skipEntities,
                     @Switch('m') Mask mask, @Switch('b') boolean copyBiomes, CommandContext context) throws WorldEditException {
-        fp.checkConfirmationRegion(getArguments(context), region);
         Vector min = region.getMinimumPoint();
         Vector max = region.getMaximumPoint();
         long volume = (((long) max.getX() - (long) min.getX() + 1) * ((long) max.getY() - (long) min.getY() + 1) * ((long) max.getZ() - (long) min.getZ() + 1));
@@ -251,9 +252,11 @@ public class ClipboardCommands extends MethodCommands {
         if (volume >= limit.MAX_CHANGES) {
             throw new FaweException(BBC.WORLDEDIT_CANCEL_REASON_MAX_CHANGES);
         }
+        Vector pos = session.getPlacementPosition(player);
+        fp.checkConfirmationRegion(() -> {
             session.setClipboard(null);
             BlockArrayClipboard clipboard = new BlockArrayClipboard(region, player.getUniqueId());
-        clipboard.setOrigin(session.getPlacementPosition(player));
+            clipboard.setOrigin(pos);
             ForwardExtentCopy copy = new ForwardExtentCopy(editSession, region, clipboard, region.getMinimumPoint());
             copy.setSourceFunction(new BlockReplace(editSession, leavePattern));
             copy.setCopyEntities(!skipEntities);
@@ -267,11 +270,12 @@ public class ClipboardCommands extends MethodCommands {
             if (mask != null) {
                 copy.setSourceMask(mask);
             }
-        Operations.completeLegacy(copy);
+            Operations.completeBlindly(copy);
             session.setClipboard(new ClipboardHolder(clipboard, editSession.getWorldData()));
 
             BBC.COMMAND_CUT_SLOW.send(player, region.getArea());
             if (!FawePlayer.wrap(player).hasPermission("fawe.tips")) BBC.TIP_LAZYCUT.send(player);
+        }, getArguments(context), region);
     }
 
     @Command(aliases = {"download"}, desc = "Downloads your clipboard through the configured web interface")

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

@@ -85,10 +85,11 @@ public class GenerationCommands extends MethodCommands {
     @CommandPermissions("worldedit.generation.caves")
     @Logging(PLACEMENT)
     public void caves(FawePlayer fp, LocalSession session, EditSession editSession, @Selection Region region, @Optional("8") int size, @Optional("40") int frequency, @Optional("7") int rarity, @Optional("8") int minY, @Optional("127") int maxY, @Optional("1") int systemFrequency, @Optional("25") int individualRarity, @Optional("0") int pocketChance, @Optional("0") int pocketMin, @Optional("3") int pocketMax, CommandContext context) throws WorldEditException, ParameterException {
-        fp.checkConfirmationRegion(getArguments(context), region);
+        fp.checkConfirmationRegion(() -> {
             CavesGen gen = new CavesGen(size, frequency, rarity, minY, maxY, systemFrequency, individualRarity, pocketChance, pocketMin, pocketMax);
             editSession.generate(region, gen);
             BBC.VISITOR_BLOCK.send(fp, editSession.getBlockChangeCount());
+        }, getArguments(context), region);
     }
 
     // public void addOre(Mask mask, Pattern material, int size, int frequency, int rarity, int minY, int maxY) throws WorldEditException {
@@ -103,9 +104,10 @@ public class GenerationCommands extends MethodCommands {
     @CommandPermissions("worldedit.generation.ore")
     @Logging(PLACEMENT)
     public void ores(FawePlayer player, LocalSession session, EditSession editSession, @Selection Region region, Mask mask, CommandContext context) throws WorldEditException, ParameterException {
-        player.checkConfirmationRegion(getArguments(context), region);
+        player.checkConfirmationRegion(() -> {
             editSession.addOres(region, mask);
             BBC.VISITOR_BLOCK.send(player, editSession.getBlockChangeCount());
+        }, getArguments(context), region);
     }
 
     @Command(
@@ -166,9 +168,10 @@ public class GenerationCommands extends MethodCommands {
     @CommandPermissions("worldedit.generation.ore")
     @Logging(PLACEMENT)
     public void ore(FawePlayer player, LocalSession session, EditSession editSession, @Selection Region region, Mask mask, Pattern material, @Range(min = 0) int size, int freq, @Range(min = 0, max = 100) int rarity, @Range(min = 0, max = 255) int minY, @Range(min = 0, max = 255) int maxY, CommandContext context) throws WorldEditException, ParameterException {
-        player.checkConfirmationRegion(getArguments(context), region);
+        player.checkConfirmationRegion(() -> {
             editSession.addOre(region, mask, material, size, freq, rarity, minY, maxY);
             BBC.VISITOR_BLOCK.send(player, editSession.getBlockChangeCount());
+        }, getArguments(context), region);
     }
 
     @Command(
@@ -188,11 +191,11 @@ public class GenerationCommands extends MethodCommands {
     public void hcyl(FawePlayer fp, Player player, LocalSession session, EditSession editSession, Pattern pattern, Vector2D radius, @Optional("1") int height, @Range(min = 1) @Optional("1") double thickness, CommandContext context) throws WorldEditException, ParameterException {
         double max = MathMan.max(radius.getBlockX(), radius.getBlockZ());
         worldEdit.checkMaxRadius(max);
-        fp.checkConfirmationRadius(getArguments(context), (int) max);
-        height = Math.min(256, height);
         Vector pos = session.getPlacementPosition(player);
-        int affected = editSession.makeHollowCylinder(pos, pattern, radius.getX(), radius.getZ(), height, thickness - 1);
+        fp.checkConfirmationRadius(() -> {
+            int affected = editSession.makeHollowCylinder(pos, pattern, radius.getX(), radius.getZ(), Math.min(256, height), thickness - 1);
             BBC.VISITOR_BLOCK.send(fp, affected);
+        }, getArguments(context), (int) max);
     }
 
     @Command(
@@ -213,11 +216,11 @@ public class GenerationCommands extends MethodCommands {
     public void cyl(FawePlayer fp, Player player, LocalSession session, EditSession editSession, Pattern pattern, Vector2D radius, @Optional("1") int height, @Switch('h') boolean hollow, CommandContext context) throws WorldEditException, ParameterException {
         double max = MathMan.max(radius.getBlockX(), radius.getBlockZ());
         worldEdit.checkMaxRadius(max);
-        fp.checkConfirmationRadius(getArguments(context), (int) max);
-        height = Math.min(256, height);
         Vector pos = session.getPlacementPosition(player);
-        int affected = editSession.makeCylinder(pos, pattern, radius.getX(), radius.getZ(), height, !hollow);
+        fp.checkConfirmationRadius(() -> {
+            int affected = editSession.makeCylinder(pos, pattern, radius.getX(), radius.getZ(), Math.min(256, height), !hollow);
             BBC.VISITOR_BLOCK.send(fp, affected);
+        }, getArguments(context), (int) max);
     }
 
     @Command(
@@ -256,16 +259,13 @@ public class GenerationCommands extends MethodCommands {
     public void sphere(FawePlayer fp, Player player, LocalSession session, EditSession editSession, Pattern pattern, Vector radius, @Optional("false") boolean raised, @Switch('h') boolean hollow, CommandContext context) throws WorldEditException, ParameterException {
         double max = MathMan.max(radius.getBlockX(), radius.getBlockY(), radius.getBlockZ());
         worldEdit.checkMaxRadius(max);
-        fp.checkConfirmationRadius(getArguments(context), (int) max);
-
         Vector pos = session.getPlacementPosition(player);
-        if (raised) {
+        Vector finalPos = raised ? pos.add(0, radius.getY(), 0) : pos;
-            pos = pos.add(0, radius.getY(), 0);
+        fp.checkConfirmationRadius(() -> {
-        }
+            int affected = editSession.makeSphere(finalPos, pattern, radius.getX(), radius.getY(), radius.getZ(), !hollow);
-
-        int affected = editSession.makeSphere(pos, pattern, radius.getX(), radius.getY(), radius.getZ(), !hollow);
             player.findFreePosition();
             BBC.VISITOR_BLOCK.send(fp, affected);
+        }, getArguments(context), (int) max);
     }
 
     @Command(
@@ -322,12 +322,13 @@ public class GenerationCommands extends MethodCommands {
     @CommandPermissions("worldedit.generation.pyramid")
     @Logging(PLACEMENT)
     public void pyramid(FawePlayer fp, Player player, LocalSession session, EditSession editSession, Pattern pattern, @Range(min = 1) int size, @Switch('h') boolean hollow, CommandContext context) throws WorldEditException, ParameterException {
-        fp.checkConfirmationRadius(getArguments(context), size);
-        Vector pos = session.getPlacementPosition(player);
         worldEdit.checkMaxRadius(size);
+        Vector pos = session.getPlacementPosition(player);
+        fp.checkConfirmationRadius(() -> {
             int affected = editSession.makePyramid(pos, pattern, size, !hollow);
             player.findFreePosition();
             BBC.VISITOR_BLOCK.send(fp, affected);
+        }, getArguments(context), size);
     }
 
     @Command(
@@ -360,7 +361,6 @@ public class GenerationCommands extends MethodCommands {
                          @Switch('o') boolean offset,
                          @Switch('c') boolean offsetCenter,
                          CommandContext context) throws WorldEditException, ParameterException {
-        fp.checkConfirmationRegion(getArguments(context), region);
         final Vector zero;
         Vector unit;
 
@@ -388,6 +388,7 @@ public class GenerationCommands extends MethodCommands {
             if (unit.getZ() == 0) unit.mutZ(1);
         }
 
+        fp.checkConfirmationRegion(() -> {
             try {
                 final int affected = editSession.makeShape(region, zero, unit, pattern, expression, hollow);
                 player.findFreePosition();
@@ -395,6 +396,7 @@ public class GenerationCommands extends MethodCommands {
             } catch (ExpressionException e) {
                 fp.sendMessage(BBC.getPrefix() + e.getMessage());
             }
+        }, getArguments(context), region);
     }
 
     @Command(
@@ -427,7 +429,6 @@ public class GenerationCommands extends MethodCommands {
                               @Switch('o') boolean offset,
                               @Switch('c') boolean offsetCenter,
                               CommandContext context) throws WorldEditException, ParameterException {
-        fp.checkConfirmationRegion(getArguments(context), region);
         final Vector zero;
         Vector unit;
 
@@ -454,7 +455,7 @@ public class GenerationCommands extends MethodCommands {
             if (unit.getY() == 0) unit.mutY(1);
             if (unit.getZ() == 0) unit.mutZ(1);
         }
-
+        fp.checkConfirmationRegion(() -> {
             try {
                 final int affected = editSession.makeBiomeShape(region, zero, unit, target, expression, hollow);
                 player.findFreePosition();
@@ -462,6 +463,7 @@ public class GenerationCommands extends MethodCommands {
             } catch (ExpressionException e) {
                 fp.sendMessage(BBC.getPrefix() + e.getMessage());
             }
+        }, getArguments(context), region);
     }
 
     public static Class<GenerationCommands> inject() {

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

@@ -37,6 +37,7 @@ import com.sk89q.minecraft.util.commands.Logging;
 import com.sk89q.worldedit.*;
 import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.entity.Player;
+import com.sk89q.worldedit.extension.platform.Capability;
 import com.sk89q.worldedit.function.GroundFunction;
 import com.sk89q.worldedit.function.generator.FloraGenerator;
 import com.sk89q.worldedit.function.generator.ForestGenerator;
@@ -277,15 +278,14 @@ public class RegionCommands extends MethodCommands {
         }
         worldEdit.checkMaxRadius(thickness);
 
-        player.checkConfirmationRegion(getArguments(context), region);
+        player.checkConfirmationRegion(() -> {
-        player.checkConfirmationRadius(getArguments(context), thickness);
-
             ConvexPolyhedralRegion cpregion = (ConvexPolyhedralRegion) region;
             List<Vector> vectors = new ArrayList<Vector>(cpregion.getVertices());
 
             int blocksChanged = editSession.drawSpline(pattern, vectors, 0, 0, 0, 10, thickness, !shell);
 
             BBC.VISITOR_BLOCK.send(player, blocksChanged);
+        }, getArguments(context), region);
     }
 
     @Command(
@@ -299,14 +299,12 @@ public class RegionCommands extends MethodCommands {
     @CommandPermissions("worldedit.region.replace")
     @Logging(REGION)
     public void replace(FawePlayer player, EditSession editSession, @Selection Region region, @Optional Mask from, Pattern to, CommandContext context) throws WorldEditException {
-        player.checkConfirmationRegion(getArguments(context), region);
+        player.checkConfirmationRegion(() -> {
-        if (from == null) {
+            int affected = editSession.replaceBlocks(region, from == null ? new ExistingBlockMask(editSession) : from, to);
-            from = new ExistingBlockMask(editSession);
-        }
-        int affected = editSession.replaceBlocks(region, from, to);
             BBC.VISITOR_BLOCK.send(player, affected);
             if (!player.hasPermission("fawe.tips"))
                 BBC.TIP_REPLACE_ID.or(BBC.TIP_REPLACE_LIGHT, BBC.TIP_REPLACE_MARKER, BBC.TIP_TAB_COMPLETE).send(player);
+        }, getArguments(context), region);
     }
 
     // Compatibility for SKCompat
@@ -325,7 +323,7 @@ public class RegionCommands extends MethodCommands {
     @CommandPermissions("worldedit.region.set")
     @Logging(REGION)
     public void set(FawePlayer player, LocalSession session, EditSession editSession, @Selection Region selection, Pattern to, CommandContext context) throws WorldEditException {
-        player.checkConfirmationRegion(getArguments(context), selection);
+        player.checkConfirmationRegion(() -> {
             int affected;
             affected = editSession.setBlocks(selection, to);
             if (affected != 0) {
@@ -333,6 +331,7 @@ public class RegionCommands extends MethodCommands {
                 if (!player.hasPermission("fawe.tips"))
                     BBC.TIP_FAST.or(BBC.TIP_CANCEL, BBC.TIP_MASK, BBC.TIP_MASK_ANGLE, BBC.TIP_SET_LINEAR, BBC.TIP_SURFACE_SPREAD, BBC.TIP_SET_HAND).send(player);
             }
+        }, getArguments(context), selection);
     }
 
     @Command(
@@ -345,9 +344,10 @@ public class RegionCommands extends MethodCommands {
     @CommandPermissions("worldedit.region.overlay")
     @Logging(REGION)
     public void overlay(FawePlayer player, EditSession editSession, @Selection Region region, Pattern pattern, CommandContext context) throws WorldEditException {
-        player.checkConfirmationRegion(getArguments(context), region);
+        player.checkConfirmationRegion(() -> {
             int affected = editSession.overlayCuboidBlocks(region, pattern);
             BBC.VISITOR_BLOCK.send(player, affected);
+        }, getArguments(context), region);
     }
 
     @Command(
@@ -360,7 +360,7 @@ public class RegionCommands extends MethodCommands {
     @CommandPermissions("worldedit.region.overlay")
     @Logging(REGION)
     public void lay(FawePlayer player, EditSession editSession, @Selection Region region, Pattern pattern, CommandContext context) throws WorldEditException {
-        player.checkConfirmationRegion(getArguments(context), region);
+        player.checkConfirmationRegion(() -> {
             Vector min = region.getMinimumPoint();
             Vector max = region.getMaximumPoint();
             int maxY = max.getBlockY();
@@ -382,6 +382,7 @@ public class RegionCommands extends MethodCommands {
                 affected++;
             }
             BBC.VISITOR_BLOCK.send(player, affected);
+        }, getArguments(context), region);
     }
 
     @Command(
@@ -408,9 +409,10 @@ public class RegionCommands extends MethodCommands {
     @CommandPermissions("worldedit.region.naturalize")
     @Logging(REGION)
     public void naturalize(FawePlayer player, EditSession editSession, @Selection Region region, CommandContext context) throws WorldEditException {
-        player.checkConfirmationRegion(getArguments(context), region);
+        player.checkConfirmationRegion(() -> {
             int affected = editSession.naturalizeCuboidBlocks(region);
             BBC.VISITOR_BLOCK.send(player, affected);
+        }, getArguments(context), region);
     }
 
     @Command(
@@ -423,9 +425,10 @@ public class RegionCommands extends MethodCommands {
     @CommandPermissions("worldedit.region.walls")
     @Logging(REGION)
     public void walls(FawePlayer player, EditSession editSession, @Selection Region region, Pattern pattern, CommandContext context) throws WorldEditException {
-        player.checkConfirmationRegion(getArguments(context), region);
+        player.checkConfirmationRegion(() -> {
-        int affected = editSession.makeCuboidWalls(region, pattern);
+            int affected = editSession.makeWalls(region, pattern);
             BBC.VISITOR_BLOCK.send(player, affected);
+        }, getArguments(context), region);
     }
 
     @Command(
@@ -438,9 +441,10 @@ public class RegionCommands extends MethodCommands {
     @CommandPermissions("worldedit.region.faces")
     @Logging(REGION)
     public void faces(FawePlayer player, EditSession editSession, @Selection Region region, Pattern pattern, CommandContext context) throws WorldEditException {
-        player.checkConfirmationRegion(getArguments(context), region);
+        player.checkConfirmationRegion(() -> {
             int affected = editSession.makeCuboidFaces(region, pattern);
             BBC.VISITOR_BLOCK.send(player, affected);
+        }, getArguments(context), region);
     }
 
     @Command(
@@ -458,7 +462,6 @@ public class RegionCommands extends MethodCommands {
     @CommandPermissions("worldedit.region.smoothsnow")
     @Logging(REGION)
     public void smooth(FawePlayer player, EditSession editSession, @Selection Region region, @Optional("1") int iterations, @Switch('n') boolean affectNatural, @Switch('s') boolean snow, CommandContext context) throws WorldEditException {
-        try {
         Vector min = region.getMinimumPoint();
         Vector max = region.getMaximumPoint();
         long volume = (((long) max.getX() - (long) min.getX() + 1) * ((long) max.getY() - (long) min.getY() + 1) * ((long) max.getZ() - (long) min.getZ() + 1));
@@ -466,7 +469,8 @@ public class RegionCommands extends MethodCommands {
         if (volume >= limit.MAX_CHECKS) {
             throw new FaweException(BBC.WORLDEDIT_CANCEL_REASON_MAX_CHECKS);
         }
-            player.checkConfirmationRegion(getArguments(context), region);
+        player.checkConfirmationRegion(() -> {
+            try {
                 HeightMap heightMap = new HeightMap(editSession, region, affectNatural, snow);
                 HeightMapFilter filter = (HeightMapFilter) HeightMapFilter.class.getConstructors()[0].newInstance(GaussianKernel.class.getConstructors()[0].newInstance(5, 1));
                 int affected = heightMap.applyFilter(filter, iterations);
@@ -474,6 +478,7 @@ public class RegionCommands extends MethodCommands {
             } catch (Throwable e) {
                 throw new RuntimeException(e);
             }
+        }, getArguments(context), region);
     }
 
     @Command(
@@ -536,8 +541,7 @@ public class RegionCommands extends MethodCommands {
                      @Switch('a') boolean skipAir,
                      @Switch('s') boolean moveSelection,
                      CommandContext context) throws WorldEditException {
-        player.checkConfirmationRegion(getArguments(context), region);
+        player.checkConfirmationRegion(() -> {
-
             int affected = editSession.moveRegion(region, direction, count, !skipAir, !skipEntities, copyBiomes, replace);
 
             if (moveSelection) {
@@ -552,6 +556,7 @@ public class RegionCommands extends MethodCommands {
             }
 
             BBC.VISITOR_BLOCK.send(player, affected);
+        }, getArguments(context), region);
     }
 
     @Command(
@@ -572,9 +577,10 @@ public class RegionCommands extends MethodCommands {
                      @Optional("air") BaseBlock replace,
                      @Switch('m') boolean notFullHeight,
                      CommandContext context) throws WorldEditException {
-        player.checkConfirmationRegion(getArguments(context), region);
+        player.checkConfirmationRegion(() -> {
             int affected = editSession.fall(region, !notFullHeight, replace);
             BBC.VISITOR_BLOCK.send(player, affected);
+        }, getArguments(context), region);
     }
 
     @Command(
@@ -600,7 +606,7 @@ public class RegionCommands extends MethodCommands {
                       @Switch('b') boolean copyBiomes,
                       @Switch('e') boolean skipEntities,
                       @Switch('a') boolean ignoreAirBlocks, @Switch('m') Mask sourceMask, CommandContext context) throws WorldEditException {
-        player.checkConfirmationStack(getArguments(context), region, count);
+        player.checkConfirmationStack(() -> {
             if (sourceMask != null) {
                 editSession.addSourceMask(sourceMask);
             }
@@ -620,6 +626,7 @@ public class RegionCommands extends MethodCommands {
             }
 
             BBC.VISITOR_BLOCK.send(player, affected);
+        }, getArguments(context), region, count);
     }
 
     @Command(
@@ -643,7 +650,6 @@ public class RegionCommands extends MethodCommands {
                        @Switch('r') boolean useRawCoords,
                        @Switch('o') boolean offset,
                        CommandContext context) throws WorldEditException {
-        fp.checkConfirmationRegion(getArguments(context), region);
         final Vector zero;
         Vector unit;
 
@@ -664,7 +670,7 @@ public class RegionCommands extends MethodCommands {
             if (unit.getY() == 0) unit.mutY(1);
             if (unit.getZ() == 0) unit.mutZ(1);
         }
-
+        fp.checkConfirmationRegion(() -> {
             try {
                 final int affected = editSession.deformRegion(region, zero, unit, expression);
                 player.findFreePosition();
@@ -672,6 +678,7 @@ public class RegionCommands extends MethodCommands {
             } catch (ExpressionException e) {
                 fp.sendMessage(BBC.getPrefix() + e.getMessage());
             }
+        }, getArguments(context), region);
     }
 
     @Command(
@@ -688,8 +695,7 @@ public class RegionCommands extends MethodCommands {
     @CommandPermissions("worldedit.regen")
     @Logging(REGION)
     public void regenerateChunk(FawePlayer player, LocalSession session, EditSession editSession, @Selection Region region, CommandContext args) throws WorldEditException {
-        player.checkConfirmationRegion(getArguments(args), region);
+        player.checkConfirmationRegion(() -> {
-
             Mask mask = session.getMask();
             Mask sourceMask = session.getSourceMask();
             session.setMask((Mask) null);
@@ -715,6 +721,7 @@ public class RegionCommands extends MethodCommands {
             } else {
                 BBC.COMMAND_REGEN_2.send(player);
             }
+        }, getArguments(args), region);
     }
 
     @Command(
@@ -735,9 +742,10 @@ public class RegionCommands extends MethodCommands {
                        @Optional("0") @Range(min = 0) int thickness,
                        @Optional("air") Pattern pattern,
                        CommandContext context) throws WorldEditException {
-        player.checkConfirmationRegion(getArguments(context), region);
+        player.checkConfirmationRegion(() -> {
             int affected = editSession.hollowOutRegion(region, thickness, pattern);
             BBC.VISITOR_BLOCK.send(player, affected);
+        }, getArguments(context), region);
     }
 
     @Command(
@@ -752,16 +760,15 @@ public class RegionCommands extends MethodCommands {
     public void forest(FawePlayer player, EditSession editSession, @Selection Region region, @Optional("tree") TreeType type,
                        @Optional("5") @Range(min = 0, max = 100) double density,
                        CommandContext context) throws WorldEditException {
-        player.checkConfirmationRegion(getArguments(context), region);
+        player.checkConfirmationRegion(() -> {
-
-        density = density / 100;
             ForestGenerator generator = new ForestGenerator(editSession, new TreeGenerator(type));
             GroundFunction ground = new GroundFunction(new ExistingBlockMask(editSession), generator);
             LayerVisitor visitor = new LayerVisitor(asFlatRegion(region), minimumBlockY(region), maximumBlockY(region), ground);
-        visitor.setMask(new NoiseFilter2D(new RandomNoise(), density));
+            visitor.setMask(new NoiseFilter2D(new RandomNoise(), density / 100));
             Operations.completeLegacy(visitor);
 
             BBC.COMMAND_TREE.send(player, ground.getAffected());
+        }, getArguments(context), region);
     }
 
     @Command(
@@ -774,15 +781,15 @@ public class RegionCommands extends MethodCommands {
     @CommandPermissions("worldedit.region.flora")
     @Logging(REGION)
     public void flora(FawePlayer player, EditSession editSession, @Selection Region region, @Optional("10") @Range(min = 0, max = 100) double density, CommandContext context) throws WorldEditException {
-        player.checkConfirmationRegion(getArguments(context), region);
+        player.checkConfirmationRegion(() -> {
-        density = density / 100;
             FloraGenerator generator = new FloraGenerator(editSession);
             GroundFunction ground = new GroundFunction(new ExistingBlockMask(editSession), generator);
             LayerVisitor visitor = new LayerVisitor(asFlatRegion(region), minimumBlockY(region), maximumBlockY(region), ground);
-        visitor.setMask(new NoiseFilter2D(new RandomNoise(), density));
+            visitor.setMask(new NoiseFilter2D(new RandomNoise(), density / 100));
             Operations.completeLegacy(visitor);
 
             BBC.COMMAND_FLORA.send(player, ground.getAffected());
+        }, getArguments(context), region);
     }
 
     public static Class<?> inject() {

core/src/main/java/com/sk89q/worldedit/util/command/parametric/FaweParanamer.java

@@ -28,7 +28,9 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.thoughtworks.paranamer;
+package com.sk89q.worldedit.util.command.parametric;
+
+import com.thoughtworks.paranamer.CachingParanamer;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;

core/src/main/java/com/sk89q/worldedit/util/command/parametric/ParametricBuilder.java

@@ -45,7 +45,6 @@ import com.sk89q.worldedit.util.command.ProcessedCallable;
 import com.sk89q.worldedit.util.command.binding.PrimitiveBindings;
 import com.sk89q.worldedit.util.command.binding.StandardBindings;
 import com.sk89q.worldedit.util.command.binding.Switch;
-import com.thoughtworks.paranamer.FaweParanamer;
 import com.thoughtworks.paranamer.Paranamer;
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;