summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Essentials/src/com/earth2me/essentials/perm/PermissionsHandler.java33
1 files changed, 22 insertions, 11 deletions
diff --git a/Essentials/src/com/earth2me/essentials/perm/PermissionsHandler.java b/Essentials/src/com/earth2me/essentials/perm/PermissionsHandler.java
index 8adff346a..ab69d9fe4 100644
--- a/Essentials/src/com/earth2me/essentials/perm/PermissionsHandler.java
+++ b/Essentials/src/com/earth2me/essentials/perm/PermissionsHandler.java
@@ -111,17 +111,6 @@ public class PermissionsHandler implements IPermissionsHandler
return;
}
- final Plugin permBukkitPlugin = pluginManager.getPlugin("PermissionsBukkit");
- if (permBukkitPlugin != null && permBukkitPlugin.isEnabled())
- {
- if (!(handler instanceof PermissionsBukkitHandler))
- {
- LOGGER.log(Level.INFO, "Essentials: Using PermissionsBukkit based permissions.");
- handler = new PermissionsBukkitHandler(permBukkitPlugin);
- }
- return;
- }
-
final Plugin bPermPlugin = pluginManager.getPlugin("bPermissions");
if (bPermPlugin != null && bPermPlugin.isEnabled())
{
@@ -132,6 +121,28 @@ public class PermissionsHandler implements IPermissionsHandler
}
return;
}
+
+ final Plugin GMplugin = pluginManager.getPlugin("GroupManager");
+ if (GMplugin != null && GMplugin.isEnabled())
+ {
+ if (!(handler instanceof GroupManagerHandler))
+ {
+ LOGGER.log(Level.INFO, "Essentials: Using GroupManager based permissions.");
+ handler = new GroupManagerHandler(GMplugin);
+ }
+ return;
+ }
+
+ final Plugin permBukkitPlugin = pluginManager.getPlugin("PermissionsBukkit");
+ if (permBukkitPlugin != null && permBukkitPlugin.isEnabled())
+ {
+ if (!(handler instanceof PermissionsBukkitHandler))
+ {
+ LOGGER.log(Level.INFO, "Essentials: Using PermissionsBukkit based permissions.");
+ handler = new PermissionsBukkitHandler(permBukkitPlugin);
+ }
+ return;
+ }
final Plugin permPlugin = pluginManager.getPlugin("Permissions");
if (permPlugin != null && permPlugin.isEnabled())