From ffa132fee3d9591a834379981770a224a575e96b Mon Sep 17 00:00:00 2001
From: ajgeiss0702 <ajgeiss72@gmail.com>
Date: Fri, 21 Jan 2022 13:34:33 -0700
Subject: [PATCH] finish kickall command

---
 .../commands/commands/manage/KickAll.java     | 28 ++++---------------
 .../us/ajg0702/queue/common/QueueMain.java    |  2 ++
 2 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/common/src/main/java/us/ajg0702/queue/commands/commands/manage/KickAll.java b/common/src/main/java/us/ajg0702/queue/commands/commands/manage/KickAll.java
index 3b222c1..88cb327 100644
--- a/common/src/main/java/us/ajg0702/queue/commands/commands/manage/KickAll.java
+++ b/common/src/main/java/us/ajg0702/queue/commands/commands/manage/KickAll.java
@@ -44,35 +44,20 @@ public class KickAll extends SubCommand {
         if(!checkPermission(sender)) return;
 
         if(args.length < 1) {
-            sender.sendMessage(getMessages().getComponent("commands.kick.usage"));
+            sender.sendMessage(getMessages().getComponent("commands.kickall.usage"));
             return;
         }
 
-        List<QueuePlayer> kickPlayers;
-
-        if(args.length == 1) {
-            kickPlayers = main.getQueueManager().findPlayerInQueuesByName(args[0]);
-        } else {
-            QueueServer queue = main.getQueueManager().findServer(args[1]);
-            if(queue == null) {
-                sender.sendMessage(getMessages().getComponent("commands.kick.unknown-server", "QUEUE:"+args[1]));
-                return;
-            }
-            kickPlayers = Collections.singletonList(queue.findPlayer(args[0]));
-        }
-
-        if(kickPlayers.size() == 0) {
-            sender.sendMessage(getMessages().getComponent("commands.kick.no-player", "PLAYER:"+args[0]));
-            return;
-        }
+        QueueServer server = main.getQueueManager().findServer(args[0]);
+        List<QueuePlayer> kickPlayers = new ArrayList<>(server.getQueue());
 
         for(QueuePlayer player : kickPlayers) {
             player.getQueueServer().removePlayer(player);
         }
 
         sender.sendMessage(getMessages().getComponent(
-                "commands.kick.success",
-                "PLAYER:"+args[0],
+                "commands.kickall.success",
+                "SERVER:"+args[0],
                 "NUM:"+kickPlayers.size(),
                 "s:"+ (kickPlayers.size() == 1 ? "" : "s")
         ));
@@ -81,9 +66,6 @@ public class KickAll extends SubCommand {
     @Override
     public List<String> autoComplete(ICommandSender sender, String[] args) {
         if(args.length == 1) {
-            return main.getPlatformMethods().getPlayerNames(false);
-        }
-        if(args.length == 2) {
             return main.getQueueManager().getServerNames();
         }
         return new ArrayList<>();
diff --git a/common/src/main/java/us/ajg0702/queue/common/QueueMain.java b/common/src/main/java/us/ajg0702/queue/common/QueueMain.java
index 9837fc9..e8e64b0 100644
--- a/common/src/main/java/us/ajg0702/queue/common/QueueMain.java
+++ b/common/src/main/java/us/ajg0702/queue/common/QueueMain.java
@@ -214,6 +214,8 @@ public class QueueMain extends AjQueueAPI {
         d.put("commands.kick.no-player", "&cCould not find {PLAYER}! Make sure they are in a queue!");
         d.put("commands.kick.unknown-server", "&cCould not find queue {QUEUE}. Make sure you spelled it correctly!");
         d.put("commands.kick.success", "<green>Kicked <white>{PLAYER} <green>from {NUM} queue{s}!");
+        d.put("commands.kickall.usage", "<red>Usage: /ajqueue kickall <queue>");
+        d.put("commands.kickall.success", "<green>Kicked <white>{NUM} <green>player{s} from <white>{SERVER}<green>!");
 
         d.put("noperm", "&cYou do not have permission to do this!");