diff options
Diffstat (limited to 'src/main/java/net/tylermurphy/hideAndSeek/configuration')
-rw-r--r-- | src/main/java/net/tylermurphy/hideAndSeek/configuration/Config.java | 18 | ||||
-rw-r--r-- | src/main/java/net/tylermurphy/hideAndSeek/configuration/Localization.java | 2 |
2 files changed, 16 insertions, 4 deletions
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Config.java b/src/main/java/net/tylermurphy/hideAndSeek/configuration/Config.java index ee9d88d..b83ee42 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Config.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/configuration/Config.java @@ -37,7 +37,8 @@ public class Config { glowStackable, pvpEnabled, autoJoin, - teleportToExit; + teleportToExit, + lobbyCountdownEnabled; public static int minPlayers, @@ -50,7 +51,11 @@ public class Config { saveMaxX, saveMaxZ, tauntDelay, - glowLength; + glowLength, + countdown, + changeCountdown, + lobbyMin, + lobbyMax; public static void loadConfig() { @@ -121,10 +126,17 @@ public class Config { glowStackable = manager.getBoolean("glow.stackable"); glowEnabled = manager.getBoolean("glow.enabled"); + //Lobby + minPlayers = Math.max(2, manager.getInt("minPlayers")); + countdown = Math.max(10,manager.getInt("lobby.countdown")); + changeCountdown = Math.max(minPlayers,manager.getInt("lobby.changeCountdown")); + lobbyMin = Math.max(minPlayers,manager.getInt("lobby.min")); + lobbyMax = manager.getInt("lobby.max"); + lobbyCountdownEnabled = manager.getBoolean("lobby.enabled"); + //Other nametagsVisible = manager.getBoolean("nametagsVisible"); permissionsRequired = manager.getBoolean("permissionsRequired"); - minPlayers = Math.max(2, manager.getInt("minPlayers")); gameLength = manager.getInt("gameLength"); pvpEnabled = manager.getBoolean("pvp"); autoJoin = manager.getBoolean("autoJoin"); diff --git a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Localization.java b/src/main/java/net/tylermurphy/hideAndSeek/configuration/Localization.java index 61dc5a4..05d7fb6 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Localization.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/configuration/Localization.java @@ -48,7 +48,7 @@ public class Localization { public static LocalizationString message(String key) { LocalizationString temp = LOCAL.get(key); if(temp == null) { - return new LocalizationString(ChatColor.RED + "" + ChatColor.ITALIC + key + "is not found in localization.yml. This is a plugin issue, please report it."); + return new LocalizationString(ChatColor.RED + "" + ChatColor.ITALIC + key + " is not found in localization.yml. This is a plugin issue, please report it."); } return new LocalizationString(temp.toString()); } |