From d6977aeae4f951c3961c3f58b433487188909d4d Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Sat, 22 Dec 2018 17:26:02 +1000 Subject: [PATCH] Allow a pattern for the leave-id of //move --- .../src/main/java/com/sk89q/worldedit/EditSession.java | 10 +++++----- .../com/sk89q/worldedit/command/RegionCommands.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java b/worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java index 4d1bde24d..153539a31 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java @@ -1222,11 +1222,11 @@ public class EditSession implements Extent, AutoCloseable { * @param dir the direction * @param distance the distance to move * @param copyAir true to copy air blocks - * @param replacement the replacement block to fill in after moving, or null to use air + * @param replacement the replacement pattern to fill in after moving, or null to use air * @return number of blocks moved * @throws MaxChangedBlocksException thrown if too many blocks are changed */ - public int moveRegion(Region region, BlockVector3 dir, int distance, boolean copyAir, BlockStateHolder replacement) throws MaxChangedBlocksException { + public int moveRegion(Region region, BlockVector3 dir, int distance, boolean copyAir, Pattern replacement) throws MaxChangedBlocksException { checkNotNull(region); checkNotNull(dir); checkArgument(distance >= 1, "distance >= 1 required"); @@ -1235,7 +1235,7 @@ public class EditSession implements Extent, AutoCloseable { // Remove the original blocks com.sk89q.worldedit.function.pattern.Pattern pattern = replacement != null ? - new BlockPattern(replacement) : + replacement : new BlockPattern(BlockTypes.AIR.getDefaultState()); BlockReplace remove = new BlockReplace(this, pattern); @@ -1266,11 +1266,11 @@ public class EditSession implements Extent, AutoCloseable { * @param dir the direction * @param distance the distance to move * @param copyAir true to copy air blocks - * @param replacement the replacement block to fill in after moving, or null to use air + * @param replacement the replacement pattern to fill in after moving, or null to use air * @return number of blocks moved * @throws MaxChangedBlocksException thrown if too many blocks are changed */ - public int moveCuboidRegion(Region region, BlockVector3 dir, int distance, boolean copyAir, BlockStateHolder replacement) throws MaxChangedBlocksException { + public int moveCuboidRegion(Region region, BlockVector3 dir, int distance, boolean copyAir, Pattern replacement) throws MaxChangedBlocksException { return moveRegion(region, dir, distance, copyAir, replacement); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/RegionCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/RegionCommands.java index 28851dfc1..58568cbef 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/RegionCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/RegionCommands.java @@ -276,7 +276,7 @@ public class RegionCommands { @Selection Region region, @Optional("1") @Range(min = 1) int count, @Optional(Direction.AIM) @Direction(includeDiagonals = true) BlockVector3 direction, - @Optional("air") BlockStateHolder replace, + @Optional("air") Pattern replace, @Switch('s') boolean moveSelection) throws WorldEditException { int affected = editSession.moveRegion(region, direction, count, true, replace);