EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-26 07:06:44 +01:00
Code Issues Projects Releases Wiki Activity

Fix merge all

Browse Source 
Fixes #2804
This commit is contained in:
dordsor21 2020-05-04 17:15:53 +01:00
parent a37ab10414
commit 228c37815a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Core/src/main/java/com/plotsquared/core/command/Merge.java
View File

@ -54,8 +54,8 @@ import java.util.UUID;
confirmation = true) confirmation = true)
public class Merge extends SubCommand { public class Merge extends SubCommand {
public static final String[] values = new String[] {"north", "east", "south", "west", "auto"}; public static final String[] values = new String[] {"north", "east", "south", "west"};
public static final String[] aliases = new String[] {"n", "e", "s", "w", "all"}; public static final String[] aliases = new String[] {"n", "e", "s", "w"};
public static String direction(float yaw) { public static String direction(float yaw) {
yaw = yaw / 90; yaw = yaw / 90;
@ -112,6 +112,10 @@ public class Merge extends SubCommand {
break; break;
} }
} }
if (direction == null && (args[0].equalsIgnoreCase("all") || args[1]
.equalsIgnoreCase("auto"))) {
direction = Direction.ALL;
}
} }
if (direction == null) { if (direction == null) {
MainUtil.sendMessage(player, Captions.COMMAND_SYNTAX, MainUtil.sendMessage(player, Captions.COMMAND_SYNTAX,