summaryrefslogtreecommitdiffstats
path: root/EssentialsGroupManager/src/org/anjocaido/groupmanager/GMConfiguration.java
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2011-10-28 22:07:43 +0100
committerKHobbits <rob@khobbits.co.uk>2011-10-28 22:07:43 +0100
commit8915c29b31f4809d1fa41afd5a146c6cf27a34b9 (patch)
tree7a1cbba35cdb00eb712bddd023aa47d2f51cffbd /EssentialsGroupManager/src/org/anjocaido/groupmanager/GMConfiguration.java
parent6c479fceedcbc4f44c740fa663a411ad09dde8ff (diff)
parent819c8f3aa997ada92fd97d3d22c7e35cdc1f36d4 (diff)
downloadEssentials-8915c29b31f4809d1fa41afd5a146c6cf27a34b9.tar
Essentials-8915c29b31f4809d1fa41afd5a146c6cf27a34b9.tar.gz
Essentials-8915c29b31f4809d1fa41afd5a146c6cf27a34b9.tar.lz
Essentials-8915c29b31f4809d1fa41afd5a146c6cf27a34b9.tar.xz
Essentials-8915c29b31f4809d1fa41afd5a146c6cf27a34b9.zip
Merge remote branch 'remotes/ess/groupmanager' into essmaster
Diffstat (limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/GMConfiguration.java')
-rw-r--r--EssentialsGroupManager/src/org/anjocaido/groupmanager/GMConfiguration.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GMConfiguration.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GMConfiguration.java
index ad2945076..521b8c1fb 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GMConfiguration.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GMConfiguration.java
@@ -52,10 +52,10 @@ public class GMConfiguration {
}
public boolean isOpOverride() {
- return GMconfig.getBoolean("settings.config.bukkit_perms_override", true);
+ return GMconfig.getBoolean("settings.config.opOverrides", true);
}
public boolean isBukkitPermsOverride() {
- return GMconfig.getBoolean("settings.config.opOverrides", true);
+ return GMconfig.getBoolean("settings.config.bukkit_perms_override", false);
}
public Map<String, Object> getMirrorsMap() {