add some checks for if server is offline, not full

This commit is contained in:
ajgeiss0702
2021-10-09 14:05:21 -07:00
parent 088ef52d42
commit c8a60ff18e
@@ -144,7 +144,7 @@ public class QueueServerImpl implements QueueServer {
return msgs.getString("status.offline.whitelisted"); return msgs.getString("status.offline.whitelisted");
} }
if(isFull()) { if(isFull() && !canJoinFull(p)) {
return msgs.getString("status.offline.full"); return msgs.getString("status.offline.full");
} }
@@ -327,6 +327,7 @@ public class QueueServerImpl implements QueueServer {
@Override @Override
public boolean isFull() { public boolean isFull() {
if(!isOnline()) return false;
return playerCount >= maxPlayers; return playerCount >= maxPlayers;
} }
@@ -445,6 +446,7 @@ public class QueueServerImpl implements QueueServer {
@Override @Override
public boolean canJoinFull(AdaptedPlayer player) { public boolean canJoinFull(AdaptedPlayer player) {
if(player == null) return true;
return return
player.hasPermission("ajqueue.joinfull") || player.hasPermission("ajqueue.joinfull") ||
player.hasPermission("ajqueue.joinfullserver."+name) || player.hasPermission("ajqueue.joinfullserver."+name) ||