From 1125dbeb855d015be88518147755858e74a9bc2a Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Wed, 25 Aug 2021 09:01:41 -0700 Subject: [PATCH] make sure server ping is null if the server isnt online --- .../java/us/ajg0702/queue/common/queues/QueueServerImpl.java | 5 ++++- .../queue/platforms/bungeecord/server/BungeeServerPing.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/us/ajg0702/queue/common/queues/QueueServerImpl.java b/common/src/main/java/us/ajg0702/queue/common/queues/QueueServerImpl.java index fd77111..174aef4 100644 --- a/common/src/main/java/us/ajg0702/queue/common/queues/QueueServerImpl.java +++ b/common/src/main/java/us/ajg0702/queue/common/queues/QueueServerImpl.java @@ -160,7 +160,10 @@ public class QueueServerImpl implements QueueServer { maxPlayers = 0; for(AdaptedServer pingedServer : pings.keySet()) { AdaptedServerPing serverPing = pings.get(pingedServer); - if(serverPing == null) { + if(serverPing == null || serverPing.getPlainDescription() == null) { + if(serverPing != null) { + pings.put(pingedServer, null); + } continue; } if(serverPing.getPlainDescription().contains("ajQueue;whitelisted=")) { diff --git a/platforms/bungeecord/src/main/java/us/ajg0702/queue/platforms/bungeecord/server/BungeeServerPing.java b/platforms/bungeecord/src/main/java/us/ajg0702/queue/platforms/bungeecord/server/BungeeServerPing.java index 5df1d43..9175344 100644 --- a/platforms/bungeecord/src/main/java/us/ajg0702/queue/platforms/bungeecord/server/BungeeServerPing.java +++ b/platforms/bungeecord/src/main/java/us/ajg0702/queue/platforms/bungeecord/server/BungeeServerPing.java @@ -24,7 +24,7 @@ public class BungeeServerPing implements AdaptedServerPing { @Override public String getPlainDescription() { BaseComponent desc = handle.getDescriptionComponent(); - if(desc == null) return ""; + if(desc == null) return null; return desc.toPlainText(); }