cdanesi/ajQueue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix trying to send instantly when server is unjoinable

Browse Source
This commit is contained in:
ajgeiss0702
2021-02-16 18:06:07 -07:00
parent 067043e82c
commit dde2d9aaf3
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/us/ajg0702/queue/Manager.java
+5 -2
View File
@@ -681,19 +681,21 @@ public class Manager {
int len = list.size(); int len = list.size();
boolean sendInstant = pl.config.getStringList("send-instantly").indexOf(server.getName()) != -1 && server.canAccess(p); boolean sendInstant = pl.config.getStringList("send-instantly").indexOf(server.getName()) != -1 || server.isJoinable(p);
boolean sendInstantp = list.size() <= 1 && server.canAccess(p); boolean sendInstantp = list.size() <= 1 && server.canAccess(p);
boolean timeGood = pl.config.getBoolean("check-last-player-sent-time") ? boolean timeGood = pl.config.getBoolean("check-last-player-sent-time") ?
System.currentTimeMillis() - server.getLastSentTime() > Math.floor(pl.getConfig().getDouble("wait-time")*1000) System.currentTimeMillis() - server.getLastSentTime() > Math.floor(pl.getConfig().getDouble("wait-time")*1000)
: true; : true;
if(sendInstant || (sendInstantp && timeGood)) { if((sendInstant && (sendInstantp && timeGood))) {
sendPlayers(s); sendPlayers(s);
//p.sendMessage(Main.formatMessage("sending instant"));
BaseComponent[] m = msgs.getBC("status.now-in-empty-queue", "POS:"+pos, "LEN:"+len, "SERVER:"+pl.aliases.getAlias(s)); BaseComponent[] m = msgs.getBC("status.now-in-empty-queue", "POS:"+pos, "LEN:"+len, "SERVER:"+pl.aliases.getAlias(s));
if(TextComponent.toPlainText(m).length() > 0) { if(TextComponent.toPlainText(m).length() > 0) {
p.sendMessage(m); p.sendMessage(m);
} }
} else { } else {
//p.sendMessage(Main.formatMessage("now in queue, not send instant"));
p.sendMessage(Main.formatMessage( p.sendMessage(Main.formatMessage(
msgs.get("status.now-in-queue") msgs.get("status.now-in-queue")
.replaceAll("\\{POS\\}", pos+"") .replaceAll("\\{POS\\}", pos+"")
@@ -701,6 +703,7 @@ public class Manager {
.replaceAll("\\{SERVER\\}", pl.aliases.getAlias(s)) .replaceAll("\\{SERVER\\}", pl.aliases.getAlias(s))
)); ));
} }
//p.sendMessage(Main.formatMessage(sendInstant+" && ("+sendInstantp+" && " + timeGood+")"));
BungeeUtils.sendCustomData(p, "position", pos+""); BungeeUtils.sendCustomData(p, "position", pos+"");
BungeeUtils.sendCustomData(p, "positionof", len+""); BungeeUtils.sendCustomData(p, "positionof", len+"");
src/main/java/us/ajg0702/queue/QueueServer.java
+2 -1
View File
@@ -211,7 +211,8 @@ public class QueueServer {
"online: "+this.isOnline() +"\n"+ "online: "+this.isOnline() +"\n"+
"canaccess: "+this.canAccess(p) +"\n"+ "canaccess: "+this.canAccess(p) +"\n"+
"full: "+ !this.isFull() +"\n"+ "full: "+ !this.isFull() +"\n"+
"paused: "+!this.isPaused(); "paused: "+!this.isPaused()+"\n"+
"- joinable: "+isJoinable(p);
} }