diff --git a/src/main/java/com/intellectualcrafters/plot/PS.java b/src/main/java/com/intellectualcrafters/plot/PS.java index 26ba516b6..a77d8b979 100644 --- a/src/main/java/com/intellectualcrafters/plot/PS.java +++ b/src/main/java/com/intellectualcrafters/plot/PS.java @@ -1846,6 +1846,7 @@ public class PS { // WorldEdit options.put("worldedit.require-selection-in-mask", Settings.REQUIRE_SELECTION); + options.put("worldedit.queue-commands", Settings.QUEUE_COMMANDS); options.put("worldedit.enable-for-helpers", Settings.WE_ALLOW_HELPER); options.put("worldedit.max-volume", Settings.WE_MAX_VOLUME); options.put("worldedit.max-iterations", Settings.WE_MAX_ITERATIONS); @@ -1962,6 +1963,7 @@ public class PS { Settings.TELEPORT_ON_LOGIN = config.getBoolean("teleport.on_login"); // WorldEdit + Settings.QUEUE_COMMANDS = config.getBoolean("worldedit.queue-commands"); Settings.REQUIRE_SELECTION = config.getBoolean("worldedit.require-selection-in-mask"); Settings.WE_ALLOW_HELPER = config.getBoolean("worldedit.enable-for-helpers"); Settings.WE_MAX_VOLUME = config.getLong("worldedit.max-volume"); diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Target.java b/src/main/java/com/intellectualcrafters/plot/commands/Target.java index 8f6440305..1d4926053 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/Target.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/Target.java @@ -41,12 +41,6 @@ import com.plotsquared.general.commands.CommandDeclaration; ) public class Target extends SubCommand { - public Target() { - requiredArguments = new Argument[] { - Argument.PlotID - }; - } - @Override public boolean onCommand(final PlotPlayer plr, final String[] args) { final Location ploc = plr.getLocation(); diff --git a/src/main/java/com/intellectualcrafters/plot/config/Settings.java b/src/main/java/com/intellectualcrafters/plot/config/Settings.java index 619f03057..816927cf3 100644 --- a/src/main/java/com/intellectualcrafters/plot/config/Settings.java +++ b/src/main/java/com/intellectualcrafters/plot/config/Settings.java @@ -96,6 +96,7 @@ public class Settings { * Default worldedit-require-selection-in-mask: false */ public static boolean REQUIRE_SELECTION = true; + public static boolean QUEUE_COMMANDS = false; public static boolean WE_ALLOW_HELPER = false; public static long WE_MAX_VOLUME = 500000; public static long WE_MAX_ITERATIONS = 1000; diff --git a/src/main/java/com/plotsquared/bukkit/listeners/worldedit/WEListener.java b/src/main/java/com/plotsquared/bukkit/listeners/worldedit/WEListener.java index fa0f091a4..2158a3e14 100644 --- a/src/main/java/com/plotsquared/bukkit/listeners/worldedit/WEListener.java +++ b/src/main/java/com/plotsquared/bukkit/listeners/worldedit/WEListener.java @@ -145,7 +145,7 @@ public class WEListener implements Listener { private boolean set = false; public boolean delay(final Player player, final String command, boolean delayed) { - if (!Settings.EXPERIMENTAL_FAST_ASYNC_WORLDEDIT || set) { + if (!Settings.QUEUE_COMMANDS || !Settings.EXPERIMENTAL_FAST_ASYNC_WORLDEDIT || set) { return false; } boolean free = SetBlockQueue.addNotify(null); diff --git a/target/PlotSquared-Bukkit.jar b/target/PlotSquared-Bukkit.jar index fb9334e39..0f5b3f867 100644 Binary files a/target/PlotSquared-Bukkit.jar and b/target/PlotSquared-Bukkit.jar differ diff --git a/target/PlotSquared-Sponge.jar b/target/PlotSquared-Sponge.jar index 145e150db..1017be70e 100644 Binary files a/target/PlotSquared-Sponge.jar and b/target/PlotSquared-Sponge.jar differ