diff options
author | KHobbits <rob@khobbits.co.uk> | 2013-01-31 20:38:36 +0000 |
---|---|---|
committer | KHobbits <rob@khobbits.co.uk> | 2013-01-31 20:38:36 +0000 |
commit | cdb215bebf91361ae67c5b2455c1a93e808116b7 (patch) | |
tree | 27953af661d69e5ac49db0b82dc0a001418e4356 /EssentialsGroupManager/src/org/anjocaido/groupmanager/GMConfiguration.java | |
parent | 2293cbc34fde65c06bd59d741ed19ce8472d9d9b (diff) | |
parent | fb4a7a3bd67a149c9c6c2e3d03e60bd2ba7f6c89 (diff) | |
download | Essentials-cdb215bebf91361ae67c5b2455c1a93e808116b7.tar Essentials-cdb215bebf91361ae67c5b2455c1a93e808116b7.tar.gz Essentials-cdb215bebf91361ae67c5b2455c1a93e808116b7.tar.lz Essentials-cdb215bebf91361ae67c5b2455c1a93e808116b7.tar.xz Essentials-cdb215bebf91361ae67c5b2455c1a93e808116b7.zip |
Merge branch 'groupmanager' of github.com:essentials/Essentials into 2.9
Conflicts:
EssentialsGroupManager/src/Changelog.txt
Diffstat (limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/GMConfiguration.java')
-rw-r--r-- | EssentialsGroupManager/src/org/anjocaido/groupmanager/GMConfiguration.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GMConfiguration.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GMConfiguration.java index 4fcd0a554..e5a24258e 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GMConfiguration.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GMConfiguration.java @@ -22,6 +22,7 @@ import org.yaml.snakeyaml.reader.UnicodeReader; */ public class GMConfiguration { + private boolean allowCommandBlocks = false; private boolean opOverride = true; private boolean toggleValidate = true; private Integer saveInterval = 10; @@ -40,6 +41,7 @@ public class GMConfiguration { /* * Set defaults */ + allowCommandBlocks = false; opOverride = true; toggleValidate = true; saveInterval = 10; @@ -83,6 +85,7 @@ public class GMConfiguration { try { Map<String, Object> config = getElement("config", getElement("settings", GMconfig)); + allowCommandBlocks = (Boolean) config.get("allow_commandblocks"); opOverride = (Boolean) config.get("opOverrides"); toggleValidate = (Boolean) config.get("validate_toggle"); @@ -142,6 +145,10 @@ public class GMConfiguration { return (Map<String, Object>) map.get(element); } + public boolean isAllowCommandBlocks() { + + return allowCommandBlocks; + } public boolean isOpOverride() { @@ -183,4 +190,4 @@ public class GMConfiguration { } -}
\ No newline at end of file +} |