From 228c37815a3adaacf2db80bd32685d7d5b167fd8 Mon Sep 17 00:00:00 2001 From: dordsor21 Date: Mon, 4 May 2020 17:15:53 +0100 Subject: [PATCH] Fix merge all Fixes #2804 --- .../src/main/java/com/plotsquared/core/command/Merge.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Core/src/main/java/com/plotsquared/core/command/Merge.java b/Core/src/main/java/com/plotsquared/core/command/Merge.java index 742b7fe10..7bc2cc848 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Merge.java +++ b/Core/src/main/java/com/plotsquared/core/command/Merge.java @@ -54,8 +54,8 @@ import java.util.UUID; confirmation = true) public class Merge extends SubCommand { - public static final String[] values = new String[] {"north", "east", "south", "west", "auto"}; - public static final String[] aliases = new String[] {"n", "e", "s", "w", "all"}; + public static final String[] values = new String[] {"north", "east", "south", "west"}; + public static final String[] aliases = new String[] {"n", "e", "s", "w"}; public static String direction(float yaw) { yaw = yaw / 90; @@ -112,6 +112,10 @@ public class Merge extends SubCommand { break; } } + if (direction == null && (args[0].equalsIgnoreCase("all") || args[1] + .equalsIgnoreCase("auto"))) { + direction = Direction.ALL; + } } if (direction == null) { MainUtil.sendMessage(player, Captions.COMMAND_SYNTAX,