Ignore servers not running in the confidence score

ME1312 · Mar 23, 2019 · 935a59b · 935a59b
1 parent afa34f4
commit 935a59b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git 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 void fallback(ServerKickEvent e) {
         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
@@ -284,16 +284,12 @@ public void fallback(ServerKickEvent e) {
         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()) {