Fix /roll command: add default d20 roll, improve error handling, return true on success

Agent-Logs-Url: https://github.com/Dans-Plugins/Medieval-Roleplay-Engine/sessions/a18471e3-ba4b-4758-b249-ceebd2267aaa

Co-authored-by: dmccoystephenson <21204351+dmccoystephenson@users.noreply.github.com>

Author: Copilot

src/main/java/dansplugins/rpsystem/commands/roll/RollCommand.java

@@ -6,6 +6,8 @@
 import org.bukkit.entity.Player;
 
 public class RollCommand {
+    private static final int DEFAULT_DIE_SIZE = 20;
+
     private final MedievalRoleplayEngine medievalRoleplayEngine;
 
     public RollCommand(MedievalRoleplayEngine medievalRoleplayEngine) {
@@ -14,25 +16,33 @@ public RollCommand(MedievalRoleplayEngine medievalRoleplayEngine) {
 
     public boolean rollDice(CommandSender sender, String[] args) {
 
-        if (sender instanceof Player) {
-            Player player = (Player) sender;
-            if (player.hasPermission("rp.roll") || player.hasPermission("rp.dice") || player.hasPermission("rp.default")) {
-                if (args.length > 0) {
-                    try {
-                        int max = Integer.parseInt(args[0]);
-                        medievalRoleplayEngine.messenger.sendRPMessageToPlayersWithinDistance(player, medievalRoleplayEngine.colorChecker.getNeutralAlertColor() + "" + ChatColor.ITALIC + player.getName() + " has rolled a " + rollDice(max) + " out of " + max + ".", 25);
-                    }
-                    catch(Exception ignored) {
-
-                    }
+        if (!(sender instanceof Player)) {
+            return false;
+        }
+
+        Player player = (Player) sender;
+
+        if (!(player.hasPermission("rp.roll") || player.hasPermission("rp.dice") || player.hasPermission("rp.default"))) {
+            player.sendMessage(medievalRoleplayEngine.colorChecker.getNegativeAlertColor() + "Sorry! In order to use this command, you need one of the following permissions: 'rp.roll', 'rp.dice'");
+            return false;
+        }
+
+        int max = DEFAULT_DIE_SIZE;
+        if (args.length > 0) {
+            try {
+                max = Integer.parseInt(args[0]);
+                if (max < 1) {
+                    player.sendMessage(medievalRoleplayEngine.colorChecker.getNegativeAlertColor() + "Please provide a positive number to roll.");
+                    return false;
                 }
+            } catch (NumberFormatException e) {
+                player.sendMessage(medievalRoleplayEngine.colorChecker.getNegativeAlertColor() + "'" + args[0] + "' is not a valid number. Usage: /roll [max]");
+                return false;
             }
-            else {
-                player.sendMessage(medievalRoleplayEngine.colorChecker.getNegativeAlertColor() + "Sorry! In order to use this command, you need one the following permissions: 'rp.roll', 'rp.dice'");
-            }
-
         }
-        return false;
+
+        medievalRoleplayEngine.messenger.sendRPMessageToPlayersWithinDistance(player, medievalRoleplayEngine.colorChecker.getNeutralAlertColor() + "" + ChatColor.ITALIC + player.getName() + " has rolled a " + rollDice(max) + " out of " + max + ".", 25);
+        return true;
     }
 
     private int rollDice(int max) {

src/main/resources/plugin.yml

@@ -15,7 +15,11 @@ commands:
   emote:
   me:
   roll:
+    description: Roll a die. Defaults to a d20 if no max is specified.
+    usage: /roll [max]
   dice:
+    description: Roll a die. Defaults to a d20 if no max is specified.
+    usage: /dice [max]
   title:
   yell:
   whisper: