doesnt send empty queue message if the server is offline/full/etc
This commit is contained in:
@@ -3,8 +3,6 @@ package us.ajg0702.queue;
|
|||||||
import java.io.ByteArrayInputStream;
|
import java.io.ByteArrayInputStream;
|
||||||
import java.io.DataInputStream;
|
import java.io.DataInputStream;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.LinkedHashMap;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.concurrent.Callable;
|
import java.util.concurrent.Callable;
|
||||||
|
|
||||||
|
|||||||
@@ -390,7 +390,8 @@ public class Manager {
|
|||||||
}
|
}
|
||||||
int pos = list.indexOf(p)+1;
|
int pos = list.indexOf(p)+1;
|
||||||
int len = list.size();
|
int len = list.size();
|
||||||
if(list.size() <= 1) {
|
if(list.size() <= 1 && server.isOnline() && server.canAccess(p) && !server.isFull() && !server.isWhitelisted()) {
|
||||||
|
sendPlayers(s);
|
||||||
p.sendMessage(Main.formatMessage(
|
p.sendMessage(Main.formatMessage(
|
||||||
msgs.get("status.now-in-empty-queue")
|
msgs.get("status.now-in-empty-queue")
|
||||||
.replaceAll("\\{POS\\}", pos+"")
|
.replaceAll("\\{POS\\}", pos+"")
|
||||||
@@ -410,10 +411,6 @@ public class Manager {
|
|||||||
BungeeUtils.sendCustomData(p, "positionof", len+"");
|
BungeeUtils.sendCustomData(p, "positionof", len+"");
|
||||||
BungeeUtils.sendCustomData(p, "queuename", s);
|
BungeeUtils.sendCustomData(p, "queuename", s);
|
||||||
BungeeUtils.sendCustomData(p, "inqueue", "true");
|
BungeeUtils.sendCustomData(p, "inqueue", "true");
|
||||||
|
|
||||||
if(list.size() <= 1) {
|
|
||||||
sendPlayers(s);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -427,4 +424,8 @@ public class Manager {
|
|||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Server getServer(String name) {
|
||||||
|
return findServer(name);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -92,6 +92,9 @@ public class Server {
|
|||||||
public boolean getWhitelisted() {
|
public boolean getWhitelisted() {
|
||||||
return whitelisted;
|
return whitelisted;
|
||||||
}
|
}
|
||||||
|
public boolean isWhitelisted() {
|
||||||
|
return whitelisted;
|
||||||
|
}
|
||||||
public List<String> getWhitelistedPlayers() {
|
public List<String> getWhitelistedPlayers() {
|
||||||
return whitelistedplayers;
|
return whitelistedplayers;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user