From 74f6ab4866f1f7984369aea920299c36216ddffa Mon Sep 17 00:00:00 2001 From: Christopher Bohn Date: Tue, 20 Feb 2024 13:01:05 -0800 Subject: [PATCH] Improve error handling of trim side --- .../org/popcraft/chunky/command/TrimCommand.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/org/popcraft/chunky/command/TrimCommand.java b/common/src/main/java/org/popcraft/chunky/command/TrimCommand.java index 149359d6..36ad01c5 100644 --- a/common/src/main/java/org/popcraft/chunky/command/TrimCommand.java +++ b/common/src/main/java/org/popcraft/chunky/command/TrimCommand.java @@ -84,7 +84,18 @@ public void execute(final Sender sender, final CommandArguments arguments) { return; } } - final boolean inside = arguments.next().map(String::toLowerCase).map("inside"::equals).orElse(false); + final boolean inside; + if (arguments.size() > 6) { + final Optional side = arguments.next().map(String::toLowerCase).filter(s -> "outside".equals(s) || "inside".equals(s)); + if (side.isPresent()) { + inside = side.map("inside"::equals).orElse(false); + } else { + sender.sendMessage(TranslationKey.HELP_TRIM); + return; + } + } else { + inside = false; + } final int inhabitedTime = arguments.next().flatMap(Input::tryIntegerSuffixed).orElse(Integer.MAX_VALUE); final boolean inhabitedTimeCheck = inhabitedTime < Integer.MAX_VALUE; final Selection selection = chunky.getSelection().build();