diff --git a/src/main/java/com/alttd/hunger_games/config/AbstractConfig.java b/src/main/java/com/alttd/hunger_games/config/AbstractConfig.java index f123358..e2d9fa4 100644 --- a/src/main/java/com/alttd/hunger_games/config/AbstractConfig.java +++ b/src/main/java/com/alttd/hunger_games/config/AbstractConfig.java @@ -111,18 +111,23 @@ abstract class AbstractConfig { return yaml.getDouble(path, yaml.getDouble(path)); } - boolean contains(String prefix, String path) { + boolean isValidSection(String prefix, String path) { + return getConfigurationSection(prefix + path) != null; + } + + boolean isEmpty(String prefix, String path) { path = prefix + path; - return !yaml.contains(path); + return yaml.get(path) == null; } Optional getLocation(String prefix, String path) { - if (contains(prefix, path)) { + if (!isValidSection(prefix, path)) { + log.warn("No location configuration for {}", prefix + path); return Optional.empty(); } - +//destination.start-center.world String rootPath = prefix + path + "."; - if (contains(rootPath, "world") || contains(rootPath, path + "x") || contains(rootPath, path + "y") || contains(rootPath, path + "z")) { + if (isEmpty(rootPath, "world") || isEmpty(rootPath, "x") || isEmpty(rootPath, "y") || isEmpty(rootPath, "z")) { ConfigurationSection configurationSection = getConfigurationSection(prefix + path); log.error("Invalid location configuration for:\n\t{}", configurationSection.getKeys(false).stream().map(key -> rootPath + key).collect(Collectors.joining("\n\t"))); return Optional.empty(); diff --git a/src/main/java/com/alttd/hunger_games/config/Messages.java b/src/main/java/com/alttd/hunger_games/config/Messages.java index 40f28c6..4b57fda 100644 --- a/src/main/java/com/alttd/hunger_games/config/Messages.java +++ b/src/main/java/com/alttd/hunger_games/config/Messages.java @@ -73,8 +73,8 @@ public class Messages extends AbstractConfig { public static class GAME { private static final String prefix = "game."; - public static String WARMUP = "The Hunger Game is starting soon! Get ready!"; - public static String STARTED = "The Hunger Game has begun! Good luck!"; + public static String WARMUP = "The Hunger Games are starting soon! Get ready!"; + public static String STARTED = "The Hunger Games has begun! Good luck!"; public static String BORDER_SHRINK = "The border is shrinking to blocks!"; @SuppressWarnings("unused")