From dde2d9aaf343d4dd5b47cd7053efe13c56f8d16d Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Tue, 16 Feb 2021 18:06:07 -0700 Subject: [PATCH] fix trying to send instantly when server is unjoinable --- src/main/java/us/ajg0702/queue/Manager.java | 7 +++++-- src/main/java/us/ajg0702/queue/QueueServer.java | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/us/ajg0702/queue/Manager.java b/src/main/java/us/ajg0702/queue/Manager.java index 7abfa75..4ba6174 100644 --- a/src/main/java/us/ajg0702/queue/Manager.java +++ b/src/main/java/us/ajg0702/queue/Manager.java @@ -681,19 +681,21 @@ public class Manager { 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 timeGood = pl.config.getBoolean("check-last-player-sent-time") ? System.currentTimeMillis() - server.getLastSentTime() > Math.floor(pl.getConfig().getDouble("wait-time")*1000) : true; - if(sendInstant || (sendInstantp && timeGood)) { + if((sendInstant && (sendInstantp && timeGood))) { 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)); if(TextComponent.toPlainText(m).length() > 0) { p.sendMessage(m); } } else { + //p.sendMessage(Main.formatMessage("now in queue, not send instant")); p.sendMessage(Main.formatMessage( msgs.get("status.now-in-queue") .replaceAll("\\{POS\\}", pos+"") @@ -701,6 +703,7 @@ public class Manager { .replaceAll("\\{SERVER\\}", pl.aliases.getAlias(s)) )); } + //p.sendMessage(Main.formatMessage(sendInstant+" && ("+sendInstantp+" && " + timeGood+")")); BungeeUtils.sendCustomData(p, "position", pos+""); BungeeUtils.sendCustomData(p, "positionof", len+""); diff --git a/src/main/java/us/ajg0702/queue/QueueServer.java b/src/main/java/us/ajg0702/queue/QueueServer.java index 49025cf..9d15f9e 100644 --- a/src/main/java/us/ajg0702/queue/QueueServer.java +++ b/src/main/java/us/ajg0702/queue/QueueServer.java @@ -211,7 +211,8 @@ public class QueueServer { "online: "+this.isOnline() +"\n"+ "canaccess: "+this.canAccess(p) +"\n"+ "full: "+ !this.isFull() +"\n"+ - "paused: "+!this.isPaused(); + "paused: "+!this.isPaused()+"\n"+ + "- joinable: "+isJoinable(p); }