Improve error handling of trim side

pop4959 · Feb 20, 2024 · 74f6ab4 · 74f6ab4
1 parent ea68abc
commit 74f6ab4
Showing 1 changed file with 12 additions and 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
@@ -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<String> 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();