From 372b3c231ced9070ae9a1653e7fa281365397366 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 21 Oct 2012 18:30:14 +1100 Subject: [PATCH] Prevent errors when the full config is not set --- src/main/java/net/md_5/bungee/BungeeCord.java | 2 +- src/main/java/net/md_5/bungee/Configuration.java | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/md_5/bungee/BungeeCord.java b/src/main/java/net/md_5/bungee/BungeeCord.java index a0cce1fe..7629a890 100644 --- a/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/src/main/java/net/md_5/bungee/BungeeCord.java @@ -118,7 +118,7 @@ public class BungeeCord String[] split = commandLine.trim().split(" "); String commandName = split[0].toLowerCase(); Command command = commandMap.get(commandName); - if (command != null && !config.disabledCommands.contains(commandName)) + if (command != null && (config.disabledCommands == null || !config.disabledCommands.contains(commandName))) { String[] args = Arrays.copyOfRange(split, 1, split.length); try diff --git a/src/main/java/net/md_5/bungee/Configuration.java b/src/main/java/net/md_5/bungee/Configuration.java index 10357e34..4593d2e5 100644 --- a/src/main/java/net/md_5/bungee/Configuration.java +++ b/src/main/java/net/md_5/bungee/Configuration.java @@ -174,11 +174,15 @@ public class Configuration { throw new IllegalArgumentException("Server '" + defaultServerName + "' not defined"); } - for (String server : forcedServers.values()) + + if (forcedServers != null) { - if (!servers.containsKey(server)) + for (String server : forcedServers.values()) { - throw new IllegalArgumentException("Forced server " + server + " is not defined in servers"); + if (!servers.containsKey(server)) + { + throw new IllegalArgumentException("Forced server " + server + " is not defined in servers"); + } } }