finish kickall command

This commit is contained in:
ajgeiss0702
2022-01-21 13:34:33 -07:00
parent 5cb5370914
commit ffa132fee3
2 changed files with 7 additions and 23 deletions
@@ -44,35 +44,20 @@ public class KickAll extends SubCommand {
if(!checkPermission(sender)) return; if(!checkPermission(sender)) return;
if(args.length < 1) { if(args.length < 1) {
sender.sendMessage(getMessages().getComponent("commands.kick.usage")); sender.sendMessage(getMessages().getComponent("commands.kickall.usage"));
return; return;
} }
List<QueuePlayer> kickPlayers; QueueServer server = main.getQueueManager().findServer(args[0]);
List<QueuePlayer> kickPlayers = new ArrayList<>(server.getQueue());
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;
}
for(QueuePlayer player : kickPlayers) { for(QueuePlayer player : kickPlayers) {
player.getQueueServer().removePlayer(player); player.getQueueServer().removePlayer(player);
} }
sender.sendMessage(getMessages().getComponent( sender.sendMessage(getMessages().getComponent(
"commands.kick.success", "commands.kickall.success",
"PLAYER:"+args[0], "SERVER:"+args[0],
"NUM:"+kickPlayers.size(), "NUM:"+kickPlayers.size(),
"s:"+ (kickPlayers.size() == 1 ? "" : "s") "s:"+ (kickPlayers.size() == 1 ? "" : "s")
)); ));
@@ -81,9 +66,6 @@ public class KickAll extends SubCommand {
@Override @Override
public List<String> autoComplete(ICommandSender sender, String[] args) { public List<String> autoComplete(ICommandSender sender, String[] args) {
if(args.length == 1) { if(args.length == 1) {
return main.getPlatformMethods().getPlayerNames(false);
}
if(args.length == 2) {
return main.getQueueManager().getServerNames(); return main.getQueueManager().getServerNames();
} }
return new ArrayList<>(); return new ArrayList<>();
@@ -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.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.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.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!"); d.put("noperm", "&cYou do not have permission to do this!");