diff --git a/src/main/java/fr/xephi/authme/permission/PermissionsManager.java b/src/main/java/fr/xephi/authme/permission/PermissionsManager.java index a9533b618..1db9fbfd6 100644 --- a/src/main/java/fr/xephi/authme/permission/PermissionsManager.java +++ b/src/main/java/fr/xephi/authme/permission/PermissionsManager.java @@ -198,13 +198,13 @@ public class PermissionsManager implements Reloadable { return true; } - // Return if the player is an Op if sender is console or no permission system in use + // Return default if sender is not a player or no permission system is in use if (!(sender instanceof Player) || !isEnabled()) { return permissionNode.getDefaultPermission().evaluate(sender); } Player player = (Player) sender; - return handler.hasPermission(player, permissionNode); + return player.hasPermission(permissionNode.getNode()); } /** diff --git a/src/main/java/fr/xephi/authme/permission/handlers/BPermissionsHandler.java b/src/main/java/fr/xephi/authme/permission/handlers/BPermissionsHandler.java index c448d7b7c..983e42e27 100644 --- a/src/main/java/fr/xephi/authme/permission/handlers/BPermissionsHandler.java +++ b/src/main/java/fr/xephi/authme/permission/handlers/BPermissionsHandler.java @@ -22,11 +22,6 @@ public class BPermissionsHandler implements PermissionHandler { return true; } - @Override - public boolean hasPermission(Player player, PermissionNode node) { - return ApiLayer.hasPermission(player.getWorld().getName(), CalculableType.USER, player.getName(), node.getNode()); - } - @Override public boolean hasPermissionOffline(String name, PermissionNode node) { return ApiLayer.hasPermission(null, CalculableType.USER, name, node.getNode()); diff --git a/src/main/java/fr/xephi/authme/permission/handlers/GroupManagerHandler.java b/src/main/java/fr/xephi/authme/permission/handlers/GroupManagerHandler.java index 18d813e8c..a952c124d 100644 --- a/src/main/java/fr/xephi/authme/permission/handlers/GroupManagerHandler.java +++ b/src/main/java/fr/xephi/authme/permission/handlers/GroupManagerHandler.java @@ -29,12 +29,6 @@ public class GroupManagerHandler implements PermissionHandler { return true; } - @Override - public boolean hasPermission(Player player, PermissionNode node) { - final AnjoPermissionsHandler handler = groupManager.getWorldsHolder().getWorldPermissions(player); - return handler != null && handler.has(player, node.getNode()); - } - @Override public boolean hasPermissionOffline(String name, PermissionNode node) { final AnjoPermissionsHandler handler = groupManager.getWorldsHolder().getWorldPermissionsByPlayerName(name); diff --git a/src/main/java/fr/xephi/authme/permission/handlers/PermissionHandler.java b/src/main/java/fr/xephi/authme/permission/handlers/PermissionHandler.java index bf294c522..71c7a2879 100644 --- a/src/main/java/fr/xephi/authme/permission/handlers/PermissionHandler.java +++ b/src/main/java/fr/xephi/authme/permission/handlers/PermissionHandler.java @@ -28,16 +28,6 @@ public interface PermissionHandler { */ boolean hasGroupSupport(); - /** - * Check if a player has permission. - * - * @param player The player. - * @param node The permission node. - * - * @return True if the player has permission. - */ - boolean hasPermission(Player player, PermissionNode node); - /** * Check if a player has permission by their name. * Used to check an offline player's permission. diff --git a/src/main/java/fr/xephi/authme/permission/handlers/PermissionsBukkitHandler.java b/src/main/java/fr/xephi/authme/permission/handlers/PermissionsBukkitHandler.java index 22edea699..344e0aec5 100644 --- a/src/main/java/fr/xephi/authme/permission/handlers/PermissionsBukkitHandler.java +++ b/src/main/java/fr/xephi/authme/permission/handlers/PermissionsBukkitHandler.java @@ -20,11 +20,6 @@ public class PermissionsBukkitHandler implements PermissionHandler { return true; } - @Override - public boolean hasPermission(Player player, PermissionNode node) { - return player.hasPermission(node.getNode()); - } - @Override public boolean hasPermissionOffline(String name, PermissionNode node) { return false; diff --git a/src/main/java/fr/xephi/authme/permission/handlers/PermissionsExHandler.java b/src/main/java/fr/xephi/authme/permission/handlers/PermissionsExHandler.java index 7b1096f9e..e3e03ee32 100644 --- a/src/main/java/fr/xephi/authme/permission/handlers/PermissionsExHandler.java +++ b/src/main/java/fr/xephi/authme/permission/handlers/PermissionsExHandler.java @@ -37,12 +37,6 @@ public class PermissionsExHandler implements PermissionHandler { return true; } - @Override - public boolean hasPermission(Player player, PermissionNode node) { - PermissionUser user = permissionManager.getUser(player); - return user.has(node.getNode()); - } - @Override public boolean hasPermissionOffline(String name, PermissionNode node) { PermissionUser user = permissionManager.getUser(name); diff --git a/src/main/java/fr/xephi/authme/permission/handlers/VaultHandler.java b/src/main/java/fr/xephi/authme/permission/handlers/VaultHandler.java index f8e322d6b..8955569ec 100644 --- a/src/main/java/fr/xephi/authme/permission/handlers/VaultHandler.java +++ b/src/main/java/fr/xephi/authme/permission/handlers/VaultHandler.java @@ -44,11 +44,6 @@ public class VaultHandler implements PermissionHandler { return vaultProvider.hasGroupSupport(); } - @Override - public boolean hasPermission(Player player, PermissionNode node) { - return vaultProvider.has(player, node.getNode()); - } - @Override public boolean hasPermissionOffline(String name, PermissionNode node) { return vaultProvider.has("", name, node.getNode()); diff --git a/src/main/java/fr/xephi/authme/permission/handlers/ZPermissionsHandler.java b/src/main/java/fr/xephi/authme/permission/handlers/ZPermissionsHandler.java index b4f3198f2..498ba4a91 100644 --- a/src/main/java/fr/xephi/authme/permission/handlers/ZPermissionsHandler.java +++ b/src/main/java/fr/xephi/authme/permission/handlers/ZPermissionsHandler.java @@ -33,15 +33,6 @@ public class ZPermissionsHandler implements PermissionHandler { return true; } - @Override - public boolean hasPermission(Player player, PermissionNode node) { - Map perms = zPermissionsService.getPlayerPermissions(player.getWorld().getName(), null, player.getName()); - if (perms.containsKey(node.getNode())) - return perms.get(node.getNode()); - else - return node.getDefaultPermission().evaluate(player); - } - @Override public boolean hasPermissionOffline(String name, PermissionNode node) { Map perms = zPermissionsService.getPlayerPermissions(null, null, name);