summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElgarL <ElgarL@palmergames.com>2013-02-26 08:49:40 -0800
committerElgarL <ElgarL@palmergames.com>2013-02-26 08:49:40 -0800
commit9d962f109dd990c8c0b73b064f1d4a739705f8bf (patch)
tree02bb015430e26326c4258bd8d60c95c142e6e63d
parentb106e0b87ba17fb753caa50af77ab78420732025 (diff)
parentbb4fb78975c3246b505232c9dd859cdac85ca1f3 (diff)
downloadEssentials-9d962f109dd990c8c0b73b064f1d4a739705f8bf.tar
Essentials-9d962f109dd990c8c0b73b064f1d4a739705f8bf.tar.gz
Essentials-9d962f109dd990c8c0b73b064f1d4a739705f8bf.tar.lz
Essentials-9d962f109dd990c8c0b73b064f1d4a739705f8bf.tar.xz
Essentials-9d962f109dd990c8c0b73b064f1d4a739705f8bf.zip
Merge pull request #361 from necrodoom/patch-66
add catches for the last 2 config settings
-rw-r--r--EssentialsGroupManager/src/org/anjocaido/groupmanager/GMConfiguration.java14
1 files changed, 11 insertions, 3 deletions
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GMConfiguration.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GMConfiguration.java
index 2f68b6d7d..fbf8109f6 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GMConfiguration.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GMConfiguration.java
@@ -87,13 +87,21 @@ public class GMConfiguration {
try {
allowCommandBlocks = (Boolean) config.get("allow_commandblocks");
-
} catch (Exception ex) {
GroupManager.logger.log(Level.SEVERE, "Missing or corrupt 'allow_commandblocks' node. Using default settings", ex);
}
- opOverride = (Boolean) config.get("opOverrides");
- toggleValidate = (Boolean) config.get("validate_toggle");
+ try {
+ opOverride = (Boolean) config.get("opOverrides");
+ } catch (Exception ex) {
+ GroupManager.logger.log(Level.SEVERE, "Missing or corrupt 'opOverrides' node. Using default settings", ex);
+ }
+
+ try {
+ toggleValidate = (Boolean) config.get("validate_toggle");
+ } catch (Exception ex) {
+ GroupManager.logger.log(Level.SEVERE, "Missing or corrupt 'validate_toggle' node. Using default settings", ex);
+ }
/*
* data node for save/backup timers.