From c8a60ff18ec2f57d97d8e88240f748a032674e77 Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Sat, 9 Oct 2021 14:05:21 -0700 Subject: [PATCH] add some checks for if server is offline, not full --- .../java/us/ajg0702/queue/common/queues/QueueServerImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/us/ajg0702/queue/common/queues/QueueServerImpl.java b/common/src/main/java/us/ajg0702/queue/common/queues/QueueServerImpl.java index 5397493..2eb8fec 100644 --- a/common/src/main/java/us/ajg0702/queue/common/queues/QueueServerImpl.java +++ b/common/src/main/java/us/ajg0702/queue/common/queues/QueueServerImpl.java @@ -144,7 +144,7 @@ public class QueueServerImpl implements QueueServer { return msgs.getString("status.offline.whitelisted"); } - if(isFull()) { + if(isFull() && !canJoinFull(p)) { return msgs.getString("status.offline.full"); } @@ -327,6 +327,7 @@ public class QueueServerImpl implements QueueServer { @Override public boolean isFull() { + if(!isOnline()) return false; return playerCount >= maxPlayers; } @@ -445,6 +446,7 @@ public class QueueServerImpl implements QueueServer { @Override public boolean canJoinFull(AdaptedPlayer player) { + if(player == null) return true; return player.hasPermission("ajqueue.joinfull") || player.hasPermission("ajqueue.joinfullserver."+name) ||