Merge pull request #3 from ReefRealm/bountysystem

Improve bounty management in SkyPVP module
FullOfRepos · Dec 25, 2023 · 1a6c7c8 · 1a6c7c8
2 parents c81a0c1 + 214f7d3
commit 1a6c7c8
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/main/java/net/reefrealm/reefrealmskypvp/bounty/commands/BountyCommand.java b/src/main/java/net/reefrealm/reefrealmskypvp/bounty/commands/BountyCommand.java
@@ -67,6 +67,10 @@ public void execute(CommandSender sender, String[] args) {
                             player.sendMessage("That player is not online.");
                             return;
                         }
+                        if (player.equals(target)) {
+                            player.sendMessage("You cannot set a bounty on yourself.");
+                            return;
+                        }
 
                         int value;
                         try {
@@ -81,12 +85,12 @@ public void execute(CommandSender sender, String[] args) {
                         }
                         if (MySQL.checkifBountyExist(target.getUniqueId().toString())) {
                             MySQL.setBounty(target.getUniqueId().toString(), value);
-                            MySQL.removeCoins(player.getUniqueId().toString(), value);
+                            player.sendMessage("Set " + target.getName() + "'s bounty to " + value + ".");
+                        } else {
+                            MySQL.createBounty(target.getUniqueId().toString(), value);
                             player.sendMessage("Created " + target.getName() + "'s bounty to " + value + ".");
                         }
-                        MySQL.createBounty(target.getUniqueId().toString(), value);
                         MySQL.removeCoins(player.getUniqueId().toString(), value);
-                        player.sendMessage("Set " + target.getName() + "'s bounty to " + value + ".");
                     } else {
                         player.sendMessage("Invalid command. Use /bounty, /bounty add <player> <value>, /bounty remove <player>, or /bounty set <player> <value>.");
                     }