mirror of
https://github.com/essentials/Essentials.git
synced 2025-08-09 08:06:54 +02:00
Don't try to use old bPerms API if it is not available.
This commit is contained in:
@@ -1,5 +1,6 @@
|
|||||||
package com.earth2me.essentials.perm;
|
package com.earth2me.essentials.perm;
|
||||||
|
|
||||||
|
import com.earth2me.essentials.Util;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
@@ -111,17 +112,6 @@ public class PermissionsHandler implements IPermissionsHandler
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
final Plugin bPermPlugin = pluginManager.getPlugin("bPermissions");
|
|
||||||
if (bPermPlugin != null && bPermPlugin.isEnabled())
|
|
||||||
{
|
|
||||||
if (!(handler instanceof BPermissionsHandler))
|
|
||||||
{
|
|
||||||
LOGGER.log(Level.INFO, "Essentials: Using bPermissions based permissions.");
|
|
||||||
handler = new BPermissionsHandler();
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
final Plugin GMplugin = pluginManager.getPlugin("GroupManager");
|
final Plugin GMplugin = pluginManager.getPlugin("GroupManager");
|
||||||
if (GMplugin != null && GMplugin.isEnabled())
|
if (GMplugin != null && GMplugin.isEnabled())
|
||||||
{
|
{
|
||||||
@@ -155,6 +145,26 @@ public class PermissionsHandler implements IPermissionsHandler
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
final Plugin bPermPlugin = pluginManager.getPlugin("bPermissions");
|
||||||
|
if (bPermPlugin != null && bPermPlugin.isEnabled())
|
||||||
|
{
|
||||||
|
final String bVer = bPermPlugin.getDescription().getVersion().replace(".", "");
|
||||||
|
if (Util.isInt(bVer) && Integer.parseInt(bVer) < 284)
|
||||||
|
{
|
||||||
|
if (!(handler instanceof BPermissionsHandler))
|
||||||
|
{
|
||||||
|
LOGGER.log(Level.INFO, "Essentials: Using bPermissions based permissions.");
|
||||||
|
handler = new BPermissionsHandler();
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (!(handler instanceof SuperpermsHandler))
|
||||||
|
{
|
||||||
|
LOGGER.log(Level.INFO, "Essentials: bPermissions api broken, switching to superperms based permissions.");
|
||||||
|
handler = new SuperpermsHandler();
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
final Plugin permPlugin = pluginManager.getPlugin("Permissions");
|
final Plugin permPlugin = pluginManager.getPlugin("Permissions");
|
||||||
if (permPlugin != null && permPlugin.isEnabled())
|
if (permPlugin != null && permPlugin.isEnabled())
|
||||||
{
|
{
|
||||||
|
@@ -27,7 +27,7 @@ public class SuperpermsHandler implements IPermissionsHandler
|
|||||||
@Override
|
@Override
|
||||||
public boolean inGroup(final Player base, final String group)
|
public boolean inGroup(final Player base, final String group)
|
||||||
{
|
{
|
||||||
return false;
|
return hasPermission(base, "group." + group);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
Reference in New Issue
Block a user