Merge branch 'dev' into 'master'
2.0.10 See merge request ajg0702/ajqueue!30
This commit is contained in:
+1
-1
@@ -12,7 +12,7 @@ repositories {
|
||||
}
|
||||
|
||||
allprojects {
|
||||
version = "2.0.9"
|
||||
version = "2.0.10"
|
||||
group = "us.ajg0702"
|
||||
|
||||
plugins.apply("java")
|
||||
|
||||
@@ -528,7 +528,11 @@ public class QueueManagerImpl implements QueueManager {
|
||||
AdaptedPlayer player = p.getPlayer();
|
||||
if(player == null) continue;
|
||||
|
||||
if(server.isFull() && !p.getPlayer().hasPermission("ajqueue.joinfull")) continue;
|
||||
boolean bypassFull =
|
||||
p.getPlayer().hasPermission("ajqueue.joinfull") ||
|
||||
p.getPlayer().hasPermission("ajqueue.joinfullserver."+server.getName());
|
||||
|
||||
if(server.isFull() && !bypassFull) continue;
|
||||
|
||||
AdaptedServer selected = server.getIdealServer(player);
|
||||
if(selected == null) {
|
||||
|
||||
Reference in New Issue
Block a user