Reworked requests command

778b · Nov 26, 2022 · e110f2a · e110f2a
1 parent f204277
commit e110f2a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/main/java/io/github/lofrol/UselessClan/commands/ClanChatCommand.java b/src/main/java/io/github/lofrol/UselessClan/commands/ClanChatCommand.java
@@ -63,7 +63,7 @@ public boolean execute(@NotNull CommandSender sender, @NotNull String commandLab
         }
 
         SenderClan.getPlayerClan().SendMessageForOnlinePlayers(
-                String.format("&6%s &2->&b %s",tempPlayer.getName() ,MegaString.toString()));
+                String.format("&6%s &2->&b%s",tempPlayer.getName() ,MegaString.toString()));
         return true;
     }
 }
diff --git a/src/main/java/io/github/lofrol/UselessClan/commands/ClanCommand.java b/src/main/java/io/github/lofrol/UselessClan/commands/ClanCommand.java
@@ -217,9 +217,14 @@ else if (args[0].equalsIgnoreCase("requests")) {
                     return false;
                 }
                 if (SenderRole == ClanRole.LEADER || SenderRole == ClanRole.OFFICER) {
-                    ChatSender.MessageTo(tempPlayer,"UselessClan", "######## CLAN REQUESTS ########");
-                    for (String tempMemberName: SenderClan.getRequests()) {
-                        ChatSender.MessageTo(tempPlayer,"UselessClan", String.format("# %s", tempMemberName));
+                    if (SenderClan.getRequests().size() > 0) {
+                        ChatSender.MessageTo(tempPlayer,"UselessClan", "######## CLAN REQUESTS ########");
+                        for (String tempMemberName: SenderClan.getRequests()) {
+                            ChatSender.MessageTo(tempPlayer,"UselessClan", String.format("# %s", tempMemberName));
+                        }
+                    }
+                    else {
+                        ChatSender.MessageTo(tempPlayer,"UselessClan", "0 requests for join to your clan");
                     }
                 }
                 else {