From 33838af1c1dbd1348c611986462cbe0c6733543e Mon Sep 17 00:00:00 2001 From: Jaime Martinez Rincon Date: Sat, 14 Jan 2017 12:34:18 +0100 Subject: [PATCH] Changed motds to descs --- .../jaimemartz/lobbybalancer/configuration/ConfigEntries.java | 2 +- .../java/me/jaimemartz/lobbybalancer/ping/PingManager.java | 2 +- .../java/me/jaimemartz/lobbybalancer/ping/ServerStatus.java | 4 ++-- src/main/resources/config.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/me/jaimemartz/lobbybalancer/configuration/ConfigEntries.java b/src/main/java/me/jaimemartz/lobbybalancer/configuration/ConfigEntries.java index 55c3d06..5047dea 100644 --- a/src/main/java/me/jaimemartz/lobbybalancer/configuration/ConfigEntries.java +++ b/src/main/java/me/jaimemartz/lobbybalancer/configuration/ConfigEntries.java @@ -17,7 +17,7 @@ public class ConfigEntries implements ConfigEntryHolder { 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_MOTDS = new ConfigEntry<>(0, "settings.server_check.marker-motds", Arrays.asList("Server is not accessible", "Gamemode has already started")); + 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 976d6c6..0f5b53c 100644 --- a/src/main/java/me/jaimemartz/lobbybalancer/ping/PingManager.java +++ b/src/main/java/me/jaimemartz/lobbybalancer/ping/PingManager.java @@ -13,10 +13,10 @@ import static me.jaimemartz.lobbybalancer.LobbyBalancer.printStartupInfo; public class PingManager { private final LobbyBalancer plugin; - private final Map storage = new HashMap<>(); private boolean stopped = true; private PingTacticType tactic; private ScheduledTask task; + private final Map storage = new HashMap<>(); public PingManager(LobbyBalancer plugin) { this.plugin = plugin; diff --git a/src/main/java/me/jaimemartz/lobbybalancer/ping/ServerStatus.java b/src/main/java/me/jaimemartz/lobbybalancer/ping/ServerStatus.java index fb2518b..b703541 100644 --- a/src/main/java/me/jaimemartz/lobbybalancer/ping/ServerStatus.java +++ b/src/main/java/me/jaimemartz/lobbybalancer/ping/ServerStatus.java @@ -13,8 +13,8 @@ public final class ServerStatus { this.maximum = maximum; boolean accessible = true; if (maximum != 0) { - for (String pattern : ConfigEntries.SERVER_CHECK_MARKER_MOTDS.get()) { - if (description.contains(pattern) || description.matches(pattern)) { + for (String pattern : ConfigEntries.SERVER_CHECK_MARKER_DESCS.get()) { + if (description.matches(pattern)) { accessible = false; } } diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 901f0d3..aa16b59 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -41,7 +41,7 @@ settings: print-info: false # The descriptions that mark a server as non accessible - marker-motds: ["Server is not accessible", "Gamemode has already started"] + marker-descs: ["Server is not accessible", "Gamemode has already started"] # This will connect the player to a server of the parent of the section the player is kicked from reconnect-kick: