minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-12 17:45:08 +02:00
Code Issues Releases Wiki Activity

If PermissionsBukkit or bPermissions is detected, we don't need the config switch.

Browse Source
This commit is contained in:
snowleo
2011-08-28 14:12:27 +02:00
parent 53056fa1ab
commit f3efe29baa
1 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Essentials/src/com/earth2me/essentials/EssentialsPluginListener.java
View File

@@ -57,8 +57,6 @@ public class EssentialsPluginListener extends ServerListener implements IConf
{ {
final Plugin permissionsPlugin = pm.getPlugin("Permissions"); final Plugin permissionsPlugin = pm.getPlugin("Permissions");
if (permissionsPlugin == null || !permissionsPlugin.isEnabled()) if (permissionsPlugin == null || !permissionsPlugin.isEnabled())
{
if (ess.getSettings().useBukkitPermissions())
{ {
final Plugin permissionsBukkitPlugin = pm.getPlugin("PermissionsBukkit"); final Plugin permissionsBukkitPlugin = pm.getPlugin("PermissionsBukkit");
final Plugin bPermissionsPlugin = pm.getPlugin("bPermissions"); final Plugin bPermissionsPlugin = pm.getPlugin("bPermissions");
@@ -78,7 +76,7 @@ public class EssentialsPluginListener extends ServerListener implements IConf
ess.setPermissionsHandler(new BPermissionsHandler()); ess.setPermissionsHandler(new BPermissionsHandler());
} }
} }
else else if (ess.getSettings().useBukkitPermissions())
{ {
if (!(ess.getPermissionsHandler() instanceof SuperpermsHandler)) if (!(ess.getPermissionsHandler() instanceof SuperpermsHandler))
{ {
@@ -86,7 +84,6 @@ public class EssentialsPluginListener extends ServerListener implements IConf
ess.setPermissionsHandler(new SuperpermsHandler()); ess.setPermissionsHandler(new SuperpermsHandler());
} }
} }
}
else else
{ {
if (!(ess.getPermissionsHandler() instanceof ConfigPermissionsHandler)) if (!(ess.getPermissionsHandler() instanceof ConfigPermissionsHandler))