2.5.0 & 2.5.1

This commit is contained in:
ajgeiss0702
2020-07-05 13:18:49 -07:00
parent c71f7e70c2
commit 31d595e713
9 changed files with 239 additions and 64 deletions
@@ -1,5 +1,7 @@
package us.ajg0702.queue.commands;
import java.util.List;
import net.md_5.bungee.api.CommandSender;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.api.plugin.Command;
@@ -23,11 +25,47 @@ public class LeaveCommand extends Command {
sender.sendMessage(msgs.getBC("errors.player-only"));
return;
}
Manager man = Manager.getInstance();
ProxiedPlayer p = (ProxiedPlayer) sender;
Server server = Manager.getInstance().findPlayerInQueue((ProxiedPlayer) sender);
if(server != null) {
server.getQueue().remove(p);
p.sendMessage(msgs.getBC("commands.leave-queue", "SERVER:"+server.getName()));
List<Server> servers = man.findPlayerInQueue(p);
if(servers.size() == 1) {
servers.get(0).getQueue().remove(p);
p.sendMessage(msgs.getBC("commands.leave-queue", "SERVER:"+plugin.aliases.getAlias(servers.get(0).getName())));
return;
}
if(args.length <= 0) {
p.sendMessage(msgs.getBC("commands.leave.more-args", "QUEUES:"+getQueueList(servers)));
return;
}
String leaving = args[0];
Server leavingsrv = man.getServer(leaving);
if(leavingsrv == null) {
p.sendMessage(msgs.getBC("commands.leave.not-queued", "QUEUES:"+getQueueList(servers)));
return;
}
if(leavingsrv.getQueue().indexOf(p) == -1) {
p.sendMessage(msgs.getBC("commands.leave.not-queued", "QUEUES:"+getQueueList(servers)));
return;
}
leavingsrv.getQueue().remove(p);
p.sendMessage(msgs.getBC("commands.leave-queue", "SERVER:"+plugin.aliases.getAlias(leavingsrv.getName())));
}
private String getQueueList(List<Server> servers) {
String queueList = "";
for(Server server : servers) {
queueList += msgs.get("commands.leave.queues-list-format").replaceAll("\\{NAME\\}", server.getName());
}
if(queueList.length() > 2) {
queueList = queueList.substring(0, queueList.length()-2);
}
return queueList;
}
}