summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElgarL <ElgarL@Palmergames.com>2014-04-27 23:55:20 +0100
committerKHobbits <rob@khobbits.co.uk>2014-05-04 12:50:21 +0100
commit211dc220d891f88d5c9e58ae934c55f07092c1fe (patch)
treeb6203d58a4bfaf009775c91fabb6cee2eb4d09df
parentaae586f79ac177734eefac9e786dc5fc50dabb43 (diff)
downloadEssentials-211dc220d891f88d5c9e58ae934c55f07092c1fe.tar
Essentials-211dc220d891f88d5c9e58ae934c55f07092c1fe.tar.gz
Essentials-211dc220d891f88d5c9e58ae934c55f07092c1fe.tar.lz
Essentials-211dc220d891f88d5c9e58ae934c55f07092c1fe.tar.xz
Essentials-211dc220d891f88d5c9e58ae934c55f07092c1fe.zip
Set a default mirror map if none is found in the config.
-rw-r--r--EssentialsGroupManager/src/Changelog.txt3
-rw-r--r--EssentialsGroupManager/src/org/anjocaido/groupmanager/GMConfiguration.java5
2 files changed, 6 insertions, 2 deletions
diff --git a/EssentialsGroupManager/src/Changelog.txt b/EssentialsGroupManager/src/Changelog.txt
index f01b2261c..583200e26 100644
--- a/EssentialsGroupManager/src/Changelog.txt
+++ b/EssentialsGroupManager/src/Changelog.txt
@@ -227,4 +227,5 @@ v 2.0:
v2.1:
- Update for CraftBukkit 1.7.8-R0.1(3050).
- Add UUID support.
- Plugins can still query by player name but a UUID is faster and preferable. \ No newline at end of file
+ Plugins can still query by player name but a UUID is faster and preferable.
+ - Set a default mirror map if none is found in the config. \ No newline at end of file
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GMConfiguration.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GMConfiguration.java
index fbf8109f6..a340482b0 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GMConfiguration.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GMConfiguration.java
@@ -80,7 +80,7 @@ public class GMConfiguration {
}
/*
- * Read our config settings ands store them for reading later.
+ * Read our config settings and store them for reading later.
*/
try {
Map<String, Object> config = getElement("config", getElement("settings", GMconfig));
@@ -135,6 +135,9 @@ public class GMConfiguration {
* Store our mirrors map for parsing later.
*/
mirrorsMap = (Map<String, Object>) ((Map<String, Object>) GMconfig.get("settings")).get("mirrors");
+
+ if (mirrorsMap == null)
+ throw new Exception();
} catch (Exception ex) {
/*