From 3090140ae85f48aa6356e20bba9e483a53ca1e51 Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Tue, 6 Jun 2023 09:09:54 -0700 Subject: [PATCH] Fixed whitelist/restricted not working well in groups --- .../queue/common/communication/CommunicationManager.java | 2 -- .../queue/common/queues/balancers/DefaultBalancer.java | 5 +++++ spigot/src/main/java/us/ajg0702/queue/spigot/SpigotMain.java | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/us/ajg0702/queue/common/communication/CommunicationManager.java b/common/src/main/java/us/ajg0702/queue/common/communication/CommunicationManager.java index bd2eb3a..750da5b 100644 --- a/common/src/main/java/us/ajg0702/queue/common/communication/CommunicationManager.java +++ b/common/src/main/java/us/ajg0702/queue/common/communication/CommunicationManager.java @@ -52,8 +52,6 @@ public class CommunicationManager { if(response == null) return; - Debug.info("Responding with " + response); - main.getPlatformMethods().sendPluginMessage( receivingPlayer, s(response.getFrom()), diff --git a/common/src/main/java/us/ajg0702/queue/common/queues/balancers/DefaultBalancer.java b/common/src/main/java/us/ajg0702/queue/common/queues/balancers/DefaultBalancer.java index 119e6ad..6370f5b 100644 --- a/common/src/main/java/us/ajg0702/queue/common/queues/balancers/DefaultBalancer.java +++ b/common/src/main/java/us/ajg0702/queue/common/queues/balancers/DefaultBalancer.java @@ -37,6 +37,11 @@ public class DefaultBalancer implements Balancer { selectednum = online; continue; } + if(!selected.isJoinable(player) && sv.isJoinable(player)) { + selected = sv; + selectednum = online; + continue; + } if(selectednum > online && sv.isJoinable(player)) { selected = sv; selectednum = online; diff --git a/spigot/src/main/java/us/ajg0702/queue/spigot/SpigotMain.java b/spigot/src/main/java/us/ajg0702/queue/spigot/SpigotMain.java index 0fc8747..abde51e 100644 --- a/spigot/src/main/java/us/ajg0702/queue/spigot/SpigotMain.java +++ b/spigot/src/main/java/us/ajg0702/queue/spigot/SpigotMain.java @@ -122,6 +122,8 @@ public class SpigotMain extends JavaPlugin implements PluginMessageListener,List ComResponse response = ComResponse.from(subchannel, in); responseManager.executeResponse(response); + } catch (IllegalStateException ignored) { + // This seems to happen often when a player leaves. So, we'll ignore it. } catch (Exception e) { getLogger().log(Level.SEVERE, "Error while processing proxy response " + subchannel + ": ", e); }