From 32d4b36419f734617d48765b568f0e5c74354d37 Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Sun, 28 Apr 2019 17:05:37 +1000 Subject: [PATCH] Fixed //drawsel --- worldedit-core/src/main/assembly/default.xml | 34 ------------------- .../worldedit/command/GeneralCommands.java | 2 +- .../worldedit/command/SchematicCommands.java | 2 +- .../worldedit/command/UtilityCommands.java | 6 ++-- 4 files changed, 4 insertions(+), 40 deletions(-) delete mode 100644 worldedit-core/src/main/assembly/default.xml diff --git a/worldedit-core/src/main/assembly/default.xml b/worldedit-core/src/main/assembly/default.xml deleted file mode 100644 index e6c1849ab..000000000 --- a/worldedit-core/src/main/assembly/default.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - false - - tar.gz - tar.bz2 - zip - - - - ${project.build.directory}/${artifactId}-${project.version}.jar - WorldEdit.jar - / - false - - - README.html - / - true - - - - - - LICENSE.txt - CHANGELOG.txt - contrib/craftscripts/* - - - - diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/GeneralCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/GeneralCommands.java index 220b30de2..08e46addc 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/GeneralCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/GeneralCommands.java @@ -161,7 +161,7 @@ public class GeneralCommands { ) @CommandPermissions("worldedit.drawsel") public void drawSelection(Player player, LocalSession session, - @Arg(desc = "The new draw selection state", def = "toggle") + @Arg(desc = "The new draw selection state", def = "") Boolean drawSelection) throws WorldEditException { if (!WorldEdit.getInstance().getConfiguration().serverSideCUI) { throw new DisallowedUsageException("This functionality is disabled in the configuration!"); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java index fe4f5f1de..829af8a9c 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java @@ -308,7 +308,7 @@ public class SchematicCommands { return res; }); - String pageCommand = actor.isPlayer() ? "/schem list -p %page%" + (oldFirst ? " -d" : newFirst ? " -n" : "") : null; + String pageCommand = actor.isPlayer() ? "//schem list -p %page%" + (oldFirst ? " -d" : newFirst ? " -n" : "") : null; PaginationBox paginationBox = new SchematicPaginationBox(worldEdit.getConfiguration().saveDir, files, pageCommand); actor.print(paginationBox.create(page)); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/UtilityCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/UtilityCommands.java index 37facdddb..da09cc5b3 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/UtilityCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/UtilityCommands.java @@ -19,6 +19,8 @@ package com.sk89q.worldedit.command; +import static com.sk89q.worldedit.command.util.Logging.LogMode.PLACEMENT; + import com.sk89q.worldedit.EditSession; import com.sk89q.worldedit.IncompleteRegionException; import com.sk89q.worldedit.LocalConfiguration; @@ -51,7 +53,6 @@ import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.regions.CuboidRegion; import com.sk89q.worldedit.regions.CylinderRegion; import com.sk89q.worldedit.regions.Region; -import com.sk89q.worldedit.util.formatting.component.InvalidComponentException; import com.sk89q.worldedit.util.formatting.component.SubtleFormat; import com.sk89q.worldedit.util.formatting.text.TextComponent; import com.sk89q.worldedit.util.formatting.text.format.TextColor; @@ -69,8 +70,6 @@ import java.util.List; import java.util.Locale; import java.util.function.Supplier; -import static com.sk89q.worldedit.command.util.Logging.LogMode.PLACEMENT; - /** * Utility commands. */ @@ -386,7 +385,6 @@ public class UtilityCommands { LocalConfiguration config = we.getConfiguration(); Player player = actor instanceof Player ? (Player) actor : null; - int defaultRadius = config.butcherDefaultRadius; if (radius == null) { radius = config.butcherDefaultRadius; } else if (radius < -1) {