summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2014-06-17 00:19:59 +0100
committerKHobbits <rob@khobbits.co.uk>2014-06-17 00:19:59 +0100
commit71e94aec9ea05940ee49c55def1233de8cbed226 (patch)
tree025ea5c250c63e20a4b3fb89814c3d464f7e56d7
parent7c013fa437252147a8c20f8eab07e4a0db8a3cc5 (diff)
downloadEssentials-71e94aec9ea05940ee49c55def1233de8cbed226.tar
Essentials-71e94aec9ea05940ee49c55def1233de8cbed226.tar.gz
Essentials-71e94aec9ea05940ee49c55def1233de8cbed226.tar.lz
Essentials-71e94aec9ea05940ee49c55def1233de8cbed226.tar.xz
Essentials-71e94aec9ea05940ee49c55def1233de8cbed226.zip
If "sethome-multiple" config section is invalid, silently fallback to default config values.
-rw-r--r--Essentials/src/com/earth2me/essentials/Settings.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Settings.java b/Essentials/src/com/earth2me/essentials/Settings.java
index 3ff5d0d4a..d653ec86c 100644
--- a/Essentials/src/com/earth2me/essentials/Settings.java
+++ b/Essentials/src/com/earth2me/essentials/Settings.java
@@ -51,7 +51,8 @@ public class Settings implements net.ess3.api.ISettings
@Override
public Set<String> getMultipleHomes()
{
- return config.getConfigurationSection("sethome-multiple").getKeys(false);
+ final ConfigurationSection section = config.getConfigurationSection("sethome-multiple");
+ return section == null ? null : section.getKeys(false);
}
@Override