From 935a59bb34b110f18c78c59c856769eaba2c63ac Mon Sep 17 00:00:00 2001 From: ME1312 Date: Sat, 23 Mar 2019 19:51:40 -0400 Subject: [PATCH] Ignore servers not running in the confidence score --- .../src/net/ME1312/SubServers/Bungee/SubPlugin.java | 6 +----- .../src/net/ME1312/SubServers/Sync/SubPlugin.java | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubPlugin.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubPlugin.java index 5765c4ef..c699e8a8 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubPlugin.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubPlugin.java @@ -775,16 +775,12 @@ public final class SubPlugin extends BungeeCord implements Listener { for (String name : e.getPlayer().getPendingConnection().getListener().getServerPriority()) { if (!e.getKickedFrom().getName().equalsIgnoreCase(name)) { ServerInfo server = getServerInfo(name); - if (server != null) { + if (server != null && (!(server instanceof SubServer) || ((SubServer) server).isRunning())) { int confidence = 0; if (server instanceof Server) { if (!((Server) server).isHidden()) confidence++; if (!((Server) server).isRestricted()) confidence++; if (((Server) server).getSubData() != null) confidence++; - - if (server instanceof SubServer) { - if (!((SubServer) server).isRunning()) continue; - }// else confidence += 0; } if (next == null || confidence > next.name()) { diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubPlugin.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubPlugin.java index acdbc85e..c8f7c31c 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubPlugin.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubPlugin.java @@ -284,16 +284,12 @@ public final class SubPlugin extends BungeeCord implements Listener { for (String name : e.getPlayer().getPendingConnection().getListener().getServerPriority()) { if (!e.getKickedFrom().getName().equalsIgnoreCase(name)) { ServerInfo server = getServerInfo(name); - if (server != null) { + if (server != null && (!(server instanceof SubServerContainer) || ((SubServerContainer) server).isRunning())) { int confidence = 0; if (server instanceof ServerContainer) { if (!((ServerContainer) server).isHidden()) confidence++; if (!((ServerContainer) server).isRestricted()) confidence++; if (((ServerContainer) server).getSubData() != null) confidence++; - - if (server instanceof SubServerContainer) { - if (!((SubServerContainer) server).isRunning()) continue; - }// else confidence += 0; } if (next == null || confidence > next.name()) {