summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElgarL <ElgarL@palmergames.com>2011-10-16 03:35:55 +0100
committerElgarL <ElgarL@palmergames.com>2011-10-16 03:35:55 +0100
commite04936455780f0649d4ae7975aeadd061fad1d29 (patch)
tree6197b327a75911a77ffa69b4bfa4936b13f9b256
parent121966436e381b96f3905301a8567b9767b2b36e (diff)
downloadEssentials-e04936455780f0649d4ae7975aeadd061fad1d29.tar
Essentials-e04936455780f0649d4ae7975aeadd061fad1d29.tar.gz
Essentials-e04936455780f0649d4ae7975aeadd061fad1d29.tar.lz
Essentials-e04936455780f0649d4ae7975aeadd061fad1d29.tar.xz
Essentials-e04936455780f0649d4ae7975aeadd061fad1d29.zip
Simplified config.yml while retaining backwards compatibility.
-rw-r--r--EssentialsGroupManager/src/Changelog.txt3
-rw-r--r--EssentialsGroupManager/src/config.yml8
-rw-r--r--EssentialsGroupManager/src/org/anjocaido/groupmanager/GMConfiguration.java8
3 files changed, 13 insertions, 6 deletions
diff --git a/EssentialsGroupManager/src/Changelog.txt b/EssentialsGroupManager/src/Changelog.txt
index c4c8f6f20..4f4851f0a 100644
--- a/EssentialsGroupManager/src/Changelog.txt
+++ b/EssentialsGroupManager/src/Changelog.txt
@@ -46,4 +46,5 @@ v 1.4:
- Removed extra notification messages for the player issuing the group move command.
- Added a config setting - bukkit_perms_override: false
Enable to allow default Bukkit based permissions to remain enabled, unless directly negated within GroupManager.
- - Fixed reading world mirrors from the config. \ No newline at end of file
+ - Fixed reading world mirrors from the config.
+ - Simplified config.yml while retaining backwards compatibility. \ No newline at end of file
diff --git a/EssentialsGroupManager/src/config.yml b/EssentialsGroupManager/src/config.yml
index 0977362a5..caa675527 100644
--- a/EssentialsGroupManager/src/config.yml
+++ b/EssentialsGroupManager/src/config.yml
@@ -2,20 +2,22 @@ settings:
config:
# With this enabled anyone set as op has full permissions when managing GroupManager
opOverrides: true
+
# If enabled any bukkit permissiosn which default to true will be left enabled.
# If the player is op any permissions set to Op will follow suit.
bukkit_perms_override: false
+
data:
save:
# How often GroupManager will save it's data back to groups and users.yml
minutes: 10
+
logging:
# level of detail GroupManager will use when logging.
# Acceptable entries are - ALL,CONFIG,FINE,FINER,FINEST,INFO,OFF,SEVERE,WARNING
level: INFO
- permission:
- world:
- mirror:
+
+ mirrors:
# Worlds listed here have their permissions mirrored in their children.
world:
- world_nether
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GMConfiguration.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GMConfiguration.java
index e57ce139e..302f12b67 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GMConfiguration.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GMConfiguration.java
@@ -59,8 +59,12 @@ public class GMConfiguration {
}
public Map<String, Object> getMirrorsMap() {
-
- return (Map<String, Object>) GMconfig.getConfigurationSection("settings.permission.world.mirror").getValues(false);
+ // Try to fetch the old mirror path first
+ if (GMconfig.isConfigurationSection("settings.permission.world.mirror"))
+ return (Map<String, Object>) GMconfig.getConfigurationSection("settings.permission.world.mirror").getValues(false);
+ else
+ return (Map<String, Object>) GMconfig.getConfigurationSection("settings.mirrors").getValues(false);
+
}
public Integer getSaveInterval() {