From a32319df288cc065633bf01f30709c526a1b7645 Mon Sep 17 00:00:00 2001 From: Jaime Martinez Rincon Date: Sat, 21 Jan 2017 20:46:01 +0100 Subject: [PATCH] Fixed an mistake that was making the ping manager not behave correctly --- .../lobbybalancer/configuration/ConfigEntries.java | 12 ++++++------ .../jaimemartz/lobbybalancer/ping/PingManager.java | 9 +++++++-- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/main/java/me/jaimemartz/lobbybalancer/configuration/ConfigEntries.java b/src/main/java/me/jaimemartz/lobbybalancer/configuration/ConfigEntries.java index 8c25bee..57cf73b 100644 --- a/src/main/java/me/jaimemartz/lobbybalancer/configuration/ConfigEntries.java +++ b/src/main/java/me/jaimemartz/lobbybalancer/configuration/ConfigEntries.java @@ -13,12 +13,12 @@ public class ConfigEntries implements ConfigEntryHolder { public static final ConfigEntry CHECK_UPDATES_ENABLED = new ConfigEntry<>(0, "settings.check-updates", true); public static final ConfigEntry SUBMIT_STATS = new ConfigEntry<>(0, "settings.submit-stats", true); - public static final ConfigEntry SERVER_CHECK_ENABLED = new ConfigEntry<>(0, "settings.server_check.enabled", true); - public static final ConfigEntry SERVER_CHECK_MODE = new ConfigEntry<>(0, "settings.server_check.tactic", "CUSTOM"); - public static final ConfigEntry SERVER_CHECK_ATTEMPTS = new ConfigEntry<>(0, "settings.server_check.attempts", 5); - public static final ConfigEntry SERVER_CHECK_INTERVAL = new ConfigEntry<>(0, "settings.server_check.interval", 10000); - public static final ConfigEntry SERVER_CHECK_PRINT_INFO = new ConfigEntry<>(0, "settings.server_check.print-info", false); - public static final ConfigEntry> SERVER_CHECK_MARKER_DESCS = new ConfigEntry<>(0, "settings.server_check.marker-descs", Arrays.asList("Server is not accessible", "Gamemode has already started")); + public static final ConfigEntry SERVER_CHECK_ENABLED = new ConfigEntry<>(0, "settings.server-check.enabled", true); + public static final ConfigEntry SERVER_CHECK_MODE = new ConfigEntry<>(0, "settings.server-check.tactic", "CUSTOM"); + public static final ConfigEntry SERVER_CHECK_ATTEMPTS = new ConfigEntry<>(0, "settings.server-check.attempts", 5); + public static final ConfigEntry SERVER_CHECK_INTERVAL = new ConfigEntry<>(0, "settings.server-check.interval", 10000); + public static final ConfigEntry SERVER_CHECK_PRINT_INFO = new ConfigEntry<>(0, "settings.server-check.print-info", false); + public static final ConfigEntry> SERVER_CHECK_MARKER_DESCS = new ConfigEntry<>(0, "settings.server-check.marker-descs", Arrays.asList("Server is not accessible", "Gamemode has already started")); public static final ConfigEntry GEOLOCATION_ENABLED = new ConfigEntry<>(0, "settings.geolocation.enabled", true); public static final ConfigEntry GEOLOCATION_PRINT_INFO = new ConfigEntry<>(0, "settings.geolocation.print-info", true); diff --git a/src/main/java/me/jaimemartz/lobbybalancer/ping/PingManager.java b/src/main/java/me/jaimemartz/lobbybalancer/ping/PingManager.java index 79920dd..683d2a3 100644 --- a/src/main/java/me/jaimemartz/lobbybalancer/ping/PingManager.java +++ b/src/main/java/me/jaimemartz/lobbybalancer/ping/PingManager.java @@ -2,6 +2,7 @@ package me.jaimemartz.lobbybalancer.ping; import me.jaimemartz.lobbybalancer.LobbyBalancer; import me.jaimemartz.lobbybalancer.configuration.ConfigEntries; +import net.md_5.bungee.api.config.ConfigurationAdapter; import net.md_5.bungee.api.config.ServerInfo; import net.md_5.bungee.api.scheduler.ScheduledTask; @@ -27,10 +28,14 @@ public class PingManager { stopped = false; tactic = PingTacticType.valueOf((ConfigEntries.SERVER_CHECK_MODE.get()).toUpperCase()); plugin.getLogger().info(String.format("Starting the ping task, the interval is %s", ConfigEntries.SERVER_CHECK_INTERVAL.get())); + ConfigurationAdapter adapter = plugin.getProxy().getConfigurationAdapter(); task = plugin.getProxy().getScheduler().schedule(plugin, () -> { for (ServerInfo server : plugin.getProxy().getServers().values()) { - if (stopped) break; - if (server != null) { + if (stopped) { + break; + } + + if (server != null && adapter.getServers().containsKey(server.getName())) { track(server); } }