fix: fix command brush (#2347)

worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/brush/CommandBrush.java

@@ -22,9 +22,27 @@ import java.util.List;
 public class CommandBrush implements Brush {
 
     private final String command;
+    private final boolean print;
 
+    /**
+     * New instance
+     *
+     * @deprecated Use {@link CommandBrush#CommandBrush(String, boolean)}
+     */
+    @Deprecated(forRemoval = true)
     public CommandBrush(String command) {
-        this.command = command.charAt(0) == '/' ? "/" + command : command;
+        this(command, false);
+    }
+
+    /**
+     * New instance
+     *
+     * @param command command to run, or commands split by ';'
+     * @param print   if output should be printed to the actor for the run commands
+     */
+    public CommandBrush(String command, boolean print) {
+        this.command = command;
+        this.print = print;
     }
 
     @Override
@@ -36,7 +54,7 @@ public class CommandBrush implements Brush {
                 position.subtract(radius, radius, radius),
                 position.add(radius, radius, radius)
         );
-        String replaced = command.replace("{x}", position.getBlockX() + "")
+        String replaced = command.replace("{x}", Integer.toString(position.getBlockX()))
                 .replace("{y}", Integer.toString(position.getBlockY()))
                 .replace("{z}", Integer.toString(position.getBlockZ()))
                 .replace("{world}", editSession.getWorld().getName())
@@ -46,21 +64,22 @@ public class CommandBrush implements Brush {
         if (!(actor instanceof Player player)) {
             throw FaweCache.PLAYER_ONLY;
         }
-        //Use max world height to allow full coverage of the world height
-        Location face = player.getBlockTraceFace(editSession.getWorld().getMaxY(), true);
-        if (face == null) {
-            position = position.add(0, 1, 1);
-        } else {
-            position = position.add(face.getDirection().toBlockPoint());
-        }
         player.setSelection(selector);
-        AsyncPlayer wePlayer = new SilentPlayerWrapper(new LocationMaskedPlayerWrapper(
+        AsyncPlayer wePlayer = new LocationMaskedPlayerWrapper(
                 player,
                 new Location(player.getExtent(), position.toVector3())
-        ));
+        );
+        if (!print) {
+            wePlayer = new SilentPlayerWrapper(wePlayer);
+        }
         List<String> cmds = StringMan.split(replaced, ';');
         for (String cmd : cmds) {
-            CommandEvent event = new CommandEvent(wePlayer, cmd);
+            if (cmd.isBlank()) {
+                continue;
+            }
+            cmd = cmd.charAt(0) != '/' ? "/" + cmd : cmd;
+            cmd = cmd.length() >1 && cmd.charAt(1) == '/' ? cmd.substring(1) : cmd;
+            CommandEvent event = new CommandEvent(wePlayer, cmd, editSession);
             PlatformCommandManager.getInstance().handleCommandOnCurrentThread(event);
         }
     }

worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/brush/ScatterCommand.java

@@ -3,7 +3,9 @@ package com.fastasyncworldedit.core.command.tool.brush;
 import com.fastasyncworldedit.core.FaweCache;
 import com.fastasyncworldedit.core.math.LocalBlockVectorSet;
 import com.fastasyncworldedit.core.util.StringMan;
+import com.fastasyncworldedit.core.wrappers.AsyncPlayer;
 import com.fastasyncworldedit.core.wrappers.LocationMaskedPlayerWrapper;
+import com.fastasyncworldedit.core.wrappers.SilentPlayerWrapper;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.entity.Player;
@@ -13,7 +15,7 @@ import com.sk89q.worldedit.extension.platform.PlatformCommandManager;
 import com.sk89q.worldedit.function.pattern.Pattern;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.regions.selector.CuboidRegionSelector;
-import com.sk89q.worldedit.util.formatting.text.Component;
+import com.sk89q.worldedit.util.Location;
 
 import java.util.List;
 
@@ -43,7 +45,7 @@ public class ScatterCommand extends ScatterBrush {
                 position.subtract(radius, radius, radius),
                 position.add(radius, radius, radius)
         );
-        String replaced = command.replace("{x}", position.getBlockX() + "")
+        String replaced = command.replace("{x}", Integer.toString(position.getBlockX()))
                 .replace("{y}", Integer.toString(position.getBlockY()))
                 .replace("{z}", Integer.toString(position.getBlockZ()))
                 .replace("{world}", editSession.getWorld().getName())
@@ -55,41 +57,22 @@ public class ScatterCommand extends ScatterBrush {
         }
         player.setSelection(selector);
         List<String> cmds = StringMan.split(replaced, ';');
+        AsyncPlayer wePlayer = new LocationMaskedPlayerWrapper(
+                player,
+                new Location(player.getExtent(), position.toVector3())
+        );
+        if (!print) {
+            wePlayer = new SilentPlayerWrapper(wePlayer);
+        }
         for (String cmd : cmds) {
-            Player p = print ?
+            if (cmd.isBlank()) {
-                    new LocationMaskedPlayerWrapper(player, player.getLocation().setPosition(position.toVector3()), false) :
+                continue;
-                    new ScatterCommandPlayerWrapper(player, position);
+            }
-            CommandEvent event = new CommandEvent(p, cmd, editSession);
+            cmd = cmd.charAt(0) != '/' ? "/" + cmd : cmd;
+            cmd = cmd.length() >1 && cmd.charAt(1) == '/' ? cmd.substring(1) : cmd;
+            CommandEvent event = new CommandEvent(wePlayer, cmd, editSession);
             PlatformCommandManager.getInstance().handleCommandOnCurrentThread(event);
         }
     }
 
-    private static final class ScatterCommandPlayerWrapper extends LocationMaskedPlayerWrapper {
-
-        ScatterCommandPlayerWrapper(Player player, BlockVector3 position) {
-            super(player, player.getLocation().setPosition(position.toVector3()), false);
-        }
-
-        @Override
-        public void print(String msg) {
-        }
-
-        @Override
-        public void print(Component component) {
-        }
-
-        @Override
-        public void printDebug(String msg) {
-        }
-
-        @Override
-        public void printError(String msg) {
-        }
-
-        @Override
-        public void printRaw(String msg) {
-        }
-
-    }
-
 }

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

@@ -929,11 +929,13 @@ public class BrushCommands {
             @Arg(desc = "Expression")
                     Expression radius,
             @Arg(desc = "Command to run")
-                    List<String> input
+                    List<String> input,
+            @Switch(name = 'p', desc = "Show any printed output")
+                    boolean print
     ) throws WorldEditException {
         worldEdit.checkMaxBrushRadius(radius);
         String cmd = StringMan.join(input, " ");
-        set(context, new CommandBrush(cmd), "worldedit.brush.command").setSize(radius);
+        set(context, new CommandBrush(cmd, print), "worldedit.brush.command").setSize(radius);
     }
 
     @Command(