Merge branch 'master' into master

bnbmc-plugins · Mar 26, 2020 · fe3f8fa · fe3f8fa
2 parents 0d08487 + 4920db3
commit fe3f8fa
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/src/main/java/net/bnbdiscord/tpplugin/commands/TPRequestDeclineCommand.java b/src/main/java/net/bnbdiscord/tpplugin/commands/TPRequestDeclineCommand.java
@@ -8,6 +8,7 @@
 import org.bukkit.entity.Player;
 
 import java.util.ArrayList;
+import java.util.Objects;
 import java.util.UUID;
 
 public class TPRequestDeclineCommand implements CommandExecutor {
@@ -35,10 +36,16 @@ public boolean onCommand(CommandSender commandSender, Command command, String s,
                 ArrayList<String> reqs = plugin.TeleportRequests.get(player.getUniqueId().toString());
                 if (reqs.size() > 1) {
                     if (args.length == 0) {
+
                         player.sendMessage(ChatColor.YELLOW + "" + ChatColor.BOLD + "PROBLEM! " + ChatColor.YELLOW + "You have multiple teleport requests:");
-                        player.sendMessage(ChatColor.YELLOW + String.join(", ", reqs));
+                        ArrayList<String> reqNames = new ArrayList<>();
+                        for(String r : reqs){
+                            reqNames.add(Objects.requireNonNull(plugin.getServer().getPlayer(UUID.fromString(r))).getName());
+                        }
+                        player.sendMessage(ChatColor.YELLOW + String.join(", ", reqNames));
                         player.sendMessage(ChatColor.YELLOW + "Therefore, you must specify someone to decline.");
                         return true;
+
                     } else if (args.length > 1) return false;
                     else {
                         Player teleportingPlayer = plugin.getServer().getPlayer(args[0]);
@@ -77,7 +84,10 @@ public boolean onCommand(CommandSender commandSender, Command command, String s,
 
                 }
             } else {
+
                 player.sendMessage(errors[new Random().nextInt(errors.length)] + "You don't have any pending teleport requests!");
+                return true;
+
             }
         }
         return false;