Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2025-01-14 20:21:50 +01:00
Code Issues Projects 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 fa423b3dd2
commit 22c277f9ab
1 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,33 +58,30 @@ 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 bPermissionsPlugin = pm.getPlugin("bPermissions");
if (permissionsBukkitPlugin != null && permissionsBukkitPlugin.isEnabled())
{ {
final Plugin permissionsBukkitPlugin = pm.getPlugin("PermissionsBukkit"); if (!(ess.getPermissionsHandler() instanceof PermissionsBukkitHandler))
final Plugin bPermissionsPlugin = pm.getPlugin("bPermissions");
if (permissionsBukkitPlugin != null && permissionsBukkitPlugin.isEnabled())
{ {
if (!(ess.getPermissionsHandler() instanceof PermissionsBukkitHandler)) LOGGER.log(Level.INFO, "Essentials: Using PermissionsBukkit based permissions.");
{ ess.setPermissionsHandler(new PermissionsBukkitHandler(permissionsBukkitPlugin));
LOGGER.log(Level.INFO, "Essentials: Using PermissionsBukkit based permissions.");
ess.setPermissionsHandler(new PermissionsBukkitHandler(permissionsBukkitPlugin));
}
} }
else if (bPermissionsPlugin != null && bPermissionsPlugin.isEnabled()) }
else if (bPermissionsPlugin != null && bPermissionsPlugin.isEnabled())
{
if (!(ess.getPermissionsHandler() instanceof BPermissionsHandler))
{ {
if (!(ess.getPermissionsHandler() instanceof BPermissionsHandler)) LOGGER.log(Level.INFO, "Essentials: Using bPermissions based permissions.");
{ ess.setPermissionsHandler(new BPermissionsHandler());
LOGGER.log(Level.INFO, "Essentials: Using bPermissions based permissions.");
ess.setPermissionsHandler(new BPermissionsHandler());
}
} }
else }
else if (ess.getSettings().useBukkitPermissions())
{
if (!(ess.getPermissionsHandler() instanceof SuperpermsHandler))
{ {
if (!(ess.getPermissionsHandler() instanceof SuperpermsHandler)) LOGGER.log(Level.INFO, "Essentials: Using superperms based permissions.");
{ ess.setPermissionsHandler(new SuperpermsHandler());
LOGGER.log(Level.INFO, "Essentials: Using superperms based permissions.");
ess.setPermissionsHandler(new SuperpermsHandler());
}
} }
} }
else else