Fixed whitelist/restricted not working well in groups

ajgeiss0702 · Jun 6, 2023 · 80289de · 80289de
1 parent a99bd73
commit 80289de
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 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
@@ -52,8 +52,6 @@ public void handle(AdaptedPlayer receivingPlayer, byte[] data) throws IOExceptio
 
         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
@@ -37,6 +37,11 @@ public AdaptedServer getIdealServer(AdaptedPlayer player) {
                     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
@@ -122,6 +122,8 @@ public void onPluginMessageReceived(@NotNull String channel, @NotNull Player pla
 			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);
 		}