From 5bb2d1eecdbf39d29958e000925488252b9644cd Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Fri, 8 Oct 2021 14:59:04 -0700 Subject: [PATCH] fix full bypass permission not being checking in isJoinable --- .../ajg0702/queue/common/queues/QueueServerImpl.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) 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 7b515c4..d10dc10 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 @@ -253,12 +253,16 @@ public class QueueServerImpl implements QueueServer { @Override public boolean isJoinable(AdaptedPlayer p) { - if(p != null && isWhitelisted() && !whitelistedUUIDs.contains(p.getUniqueId())) { - return false; + if(p != null) { + if (isWhitelisted() && !whitelistedUUIDs.contains(p.getUniqueId())) { + return false; + } + if (isFull() && !canJoinFull(p)) { + return false; + } } return isOnline() && canAccess(p) && - !isFull() && !isPaused(); }