Merge pull request #248 from dmccoystephenson/fixing-card-issue

Optimizing the /card command.
Dans-Plugins · Sep 28, 2021 · c462635 · c462635
2 parents 3895516 + 1e5affa
commit c462635
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
   <groupId>KingdomProgrammers</groupId>
   <artifactId>Medieval-Roleplay-Engine</artifactId>
-  <version>v1.9-alpha-1</version>
+  <version>v1.9-beta-1</version>
   <packaging>jar</packaging>
 
   <name>Medieval Roleplay Engine</name>

diff --git a/src/main/java/dansplugins/rpsystem/CommandInterpreter.java b/src/main/java/dansplugins/rpsystem/CommandInterpreter.java
@@ -35,7 +35,8 @@ public boolean interpretCommand(CommandSender sender, String label, String[] arg
             if (args.length == 0) {
                 command.showCard(sender, args, PersistentData.getInstance().getCards());
                 return true;
-            } else {
+            }
+            else {
 
                 if (args[0].equalsIgnoreCase("help")) {
                     command.showHelpMessage(sender);

diff --git a/src/main/java/dansplugins/rpsystem/MedievalRoleplayEngine.java b/src/main/java/dansplugins/rpsystem/MedievalRoleplayEngine.java
@@ -16,7 +16,7 @@ public class MedievalRoleplayEngine extends JavaPlugin {
     private static MedievalRoleplayEngine instance;
 
     // version
-    private String version = "v1.9-alpha-1";
+    private String version = "v1.9-beta-1";
 
     public static MedievalRoleplayEngine getInstance() {
         return instance;

diff --git a/src/main/java/dansplugins/rpsystem/commands/CardCommand.java b/src/main/java/dansplugins/rpsystem/commands/CardCommand.java
@@ -13,6 +13,7 @@
 import org.bukkit.entity.Player;
 
 import java.util.ArrayList;
+import java.util.UUID;
 
 import static org.bukkit.Bukkit.getServer;
 
@@ -248,16 +249,23 @@ public void showPlayerInfo(CommandSender sender, String[] args, ArrayList<Charac
             Player player = (Player) sender;
 
             if (player.hasPermission("rp.card.show.others") || player.hasPermission("rp.card.*") || player.hasPermission("rp.default")) {
+
+                // get UUID
+                UUID targetUUID = UUIDChecker.getInstance().findUUIDBasedOnPlayerName(args[0]);
+                if (targetUUID == null) {
+                    player.sendMessage(ColorChecker.getInstance().getNegativeAlertColor() + "That player wasn't found.");
+                    return;
+                }
+
+                // get card
                 for (CharacterCard card : cards) {
-                    if (args.length > 0) {
-                        if (card.getPlayerUUID().equals(UUIDChecker.getInstance().findUUIDBasedOnPlayerName(args[0]))) {
-                            Messenger.getInstance().sendCardInfoToPlayer(card, player);
-                            return;
-                        }
+                    if (card.getPlayerUUID().equals(targetUUID)) {
+                        Messenger.getInstance().sendCardInfoToPlayer(card, player);
+                        return;
                     }
                 }
 
-                player.sendMessage(ColorChecker.getInstance().getNegativeAlertColor() + "That player wasn't found!");
+                player.sendMessage(ColorChecker.getInstance().getNegativeAlertColor() + "That player doesn't have a card.");
 
             }
             else {

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: MedievalRoleplayEngine
-version: "1.9-alpha-1"
+version: "1.9-beta-1"
 author: DanTheTechMan
 main: dansplugins.rpsystem.MedievalRoleplayEngine
 api-version: "1.13"