Merge pull request #330 from BentoBoxWorld/329_Add_+/-_option_to_hand…

…icap_setting Adds a +/- tp the sethandicap admin command #329
BentoBoxWorld · Sep 17, 2024 · dbf3621 · dbf3621
2 parents 8caf0c4 + 09c83fa
commit dbf3621
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 9 deletions.
diff --git a/src/main/java/world/bentobox/level/commands/AdminSetInitialLevelCommand.java b/src/main/java/world/bentobox/level/commands/AdminSetInitialLevelCommand.java
@@ -46,10 +46,20 @@ public Optional<List<String>> tabComplete(User user, String alias, List<String>
 
     @Override
     public boolean execute(User user, String label, List<String> args) {
-        String initialLevel = String.valueOf(addon.getManager().getInitialLevel(island));
-        long lv = Long.parseLong(args.get(1));
+        long initialLevel = addon.getManager().getInitialLevel(island);
+        long lv = 0;
+        if (args.get(1).startsWith("+")) {
+            String change = args.get(1).substring(1);
+            lv = initialLevel + Long.parseLong(change);
+        } else if (args.get(1).startsWith("-")) {
+            String change = args.get(1).substring(1);
+            lv = initialLevel - Long.parseLong(change);
+        } else {
+            lv = Long.parseLong(args.get(1));
+        }
         addon.getManager().setInitialIslandLevel(island, lv);
-        user.sendMessage("admin.level.sethandicap.changed", TextVariables.NUMBER, initialLevel, "[new_number]", String.valueOf(lv));
+        user.sendMessage("admin.level.sethandicap.changed", TextVariables.NUMBER, String.valueOf(initialLevel),
+                "[new_number]", String.valueOf(lv));
         return true;
     }
 
@@ -64,10 +74,20 @@ public boolean canExecute(User user, String label, List<String> args) {
             user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0));
             return false;
         }
-        // Check value
-        if (!Util.isInteger(args.get(1), true)) {
-            user.sendMessage("admin.level.sethandicap.invalid-level");
-            return false;
+        // Check if this is a add or remove
+        if (args.get(1).startsWith("+") || args.get(1).startsWith("-")) {
+            String change = args.get(1).substring(1);
+            if (!Util.isInteger(change, true)) {
+                user.sendMessage("admin.level.sethandicap.invalid-level");
+                return false;
+            }
+            // Value is okay
+        } else {
+            // Check value
+            if (!Util.isInteger(args.get(1), true)) {
+                user.sendMessage("admin.level.sethandicap.invalid-level");
+                return false;
+            }
         }
         // Check island
         island = getAddon().getIslands().getIsland(getWorld(), targetUUID);

diff --git a/src/main/resources/locales/en-US.yml b/src/main/resources/locales/en-US.yml
@@ -8,8 +8,12 @@ admin:
     parameters: "<player>"
     description: "calculate the island level for player"
     sethandicap:
-      parameters: <player> <handicap>
-      description: "set the island handicap, usually the level of the starter island"
+      parameters: <player> [+/-]<handicap>
+      description: |
+        set or change the island *handicap*
+        e.g. +10 will remove 10 levels, 
+        30 will set handicap to 30,
+        -20 will add 20 levels
       changed: "&a Initial island handicap changed from [number] to [new_number]."
       invalid-level: "&c Invalid handicap. Use an integer."
   levelstatus: