From d6355adb51be64faf141898b61ac35db4ff22c8a Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Fri, 20 Nov 2015 23:52:20 +0100 Subject: [PATCH] cleanup --- src/main/java/fr/xephi/authme/AuthMe.java | 20 ++++-------- .../xephi/authme/cache/limbo/LimboCache.java | 8 ++--- .../authme/listener/AuthMeServerListener.java | 2 +- src/main/java/fr/xephi/authme/util/Utils.java | 32 +++++++++---------- 4 files changed, 27 insertions(+), 35 deletions(-) diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java index db13fe306..6ad0226bf 100644 --- a/src/main/java/fr/xephi/authme/AuthMe.java +++ b/src/main/java/fr/xephi/authme/AuthMe.java @@ -93,7 +93,7 @@ public class AuthMe extends JavaPlugin { public boolean delayedAntiBot = true; // Hooks TODO: move into modules - public Permission permission; + public Permission vaultGroupManagement; public Essentials ess; public MultiverseCore multiverse; public CombatTagPlus combatTagPlus; @@ -488,13 +488,13 @@ public class AuthMe extends JavaPlugin { if (server.getPluginManager().isPluginEnabled("Vault")) { RegisteredServiceProvider permissionProvider = server.getServicesManager().getRegistration(net.milkbowl.vault.permission.Permission.class); if (permissionProvider != null) { - permission = permissionProvider.getProvider(); - ConsoleLogger.info("Vault detected, hooking with the " + permission.getName() + " permissions system..."); + vaultGroupManagement = permissionProvider.getProvider(); + ConsoleLogger.info("Vault detected, hooking with the " + vaultGroupManagement.getName() + " group management system..."); } else { - ConsoleLogger.showError("Vault detected, but I can't find any permissions plugin to hook with!"); + ConsoleLogger.showError("Vault detected, but I can't find any group management plugin to hook with!"); } } else { - permission = null; + vaultGroupManagement = null; } } @@ -594,7 +594,6 @@ public class AuthMe extends JavaPlugin { * @return */ public boolean authmePermissible(CommandSender sender, String perm) { - // New code: // Handle players with the permissions manager if(sender instanceof Player) { // Get the player instance @@ -603,13 +602,6 @@ public class AuthMe extends JavaPlugin { // Check whether the player has permission, return the result return getPermissionsManager().hasPermission(player, perm); } - - // Legacy code: - if (sender.hasPermission(perm)) { - return true; - } else if (permission != null) { - return permission.has(sender, perm); - } return false; } @@ -682,7 +674,7 @@ public class AuthMe extends JavaPlugin { // names... (Actually it purges // only names!) if (Settings.purgePermissions) - dataManager.purgePermissions(cleared, permission); + dataManager.purgePermissions(cleared, vaultGroupManagement); } // Return the spawn location of a player diff --git a/src/main/java/fr/xephi/authme/cache/limbo/LimboCache.java b/src/main/java/fr/xephi/authme/cache/limbo/LimboCache.java index 70614107d..9a7e02d0a 100644 --- a/src/main/java/fr/xephi/authme/cache/limbo/LimboCache.java +++ b/src/main/java/fr/xephi/authme/cache/limbo/LimboCache.java @@ -60,12 +60,12 @@ public class LimboCache { operator = player.isOp(); flying = player.isFlying(); - if (plugin.permission != null) { + if (plugin.vaultGroupManagement != null) { try { - playerGroup = plugin.permission.getPrimaryGroup(player); + playerGroup = plugin.vaultGroupManagement.getPrimaryGroup(player); } catch (UnsupportedOperationException e) { - ConsoleLogger.showError("Your permission system (" + plugin.permission.getName() + ") do not support Group system with that config... unhook!"); - plugin.permission = null; + ConsoleLogger.showError("Your permission system (" + plugin.vaultGroupManagement.getName() + ") do not support Group system with that config... unhook!"); + plugin.vaultGroupManagement = null; } } } diff --git a/src/main/java/fr/xephi/authme/listener/AuthMeServerListener.java b/src/main/java/fr/xephi/authme/listener/AuthMeServerListener.java index a493080af..15cdf2dc9 100644 --- a/src/main/java/fr/xephi/authme/listener/AuthMeServerListener.java +++ b/src/main/java/fr/xephi/authme/listener/AuthMeServerListener.java @@ -62,7 +62,7 @@ public class AuthMeServerListener implements Listener { ConsoleLogger.info("CombatTagPlus has been disabled, unhook!"); } if (pluginName.equalsIgnoreCase("Vault")) { - plugin.permission = null; + plugin.vaultGroupManagement = null; ConsoleLogger.showError("Vault has been disabled, unhook permissions!"); } if (pluginName.equalsIgnoreCase("ProtocolLib")) { diff --git a/src/main/java/fr/xephi/authme/util/Utils.java b/src/main/java/fr/xephi/authme/util/Utils.java index 8af65cb8c..15ab11f83 100644 --- a/src/main/java/fr/xephi/authme/util/Utils.java +++ b/src/main/java/fr/xephi/authme/util/Utils.java @@ -106,32 +106,32 @@ public class Utils { public static void setGroup(Player player, GroupType group) { if (!Settings.isPermissionCheckEnabled) return; - if (plugin.permission == null) + if (plugin.vaultGroupManagement == null) return; String currentGroup; try { - currentGroup = plugin.permission.getPrimaryGroup(player); + currentGroup = plugin.vaultGroupManagement.getPrimaryGroup(player); } catch (UnsupportedOperationException e) { - ConsoleLogger.showError("Your permission plugin (" + plugin.permission.getName() + ") doesn't support the Group system... unhook!"); - plugin.permission = null; + ConsoleLogger.showError("Your permission plugin (" + plugin.vaultGroupManagement.getName() + ") doesn't support the Group system... unhook!"); + plugin.vaultGroupManagement = null; return; } switch (group) { case UNREGISTERED: { - plugin.permission.playerRemoveGroup(player, currentGroup); - plugin.permission.playerAddGroup(player, Settings.unRegisteredGroup); + plugin.vaultGroupManagement.playerRemoveGroup(player, currentGroup); + plugin.vaultGroupManagement.playerAddGroup(player, Settings.unRegisteredGroup); break; } case REGISTERED: { - plugin.permission.playerRemoveGroup(player, currentGroup); - plugin.permission.playerAddGroup(player, Settings.getRegisteredGroup); + plugin.vaultGroupManagement.playerRemoveGroup(player, currentGroup); + plugin.vaultGroupManagement.playerAddGroup(player, Settings.getRegisteredGroup); break; } case NOTLOGGEDIN: { if (!useGroupSystem()) break; - plugin.permission.playerRemoveGroup(player, currentGroup); - plugin.permission.playerAddGroup(player, Settings.getUnloggedinGroup); + plugin.vaultGroupManagement.playerRemoveGroup(player, currentGroup); + plugin.vaultGroupManagement.playerAddGroup(player, Settings.getUnloggedinGroup); break; } case LOGGEDIN: { @@ -141,8 +141,8 @@ public class Utils { if (limbo == null) break; String realGroup = limbo.getGroup(); - plugin.permission.playerRemoveGroup(player, currentGroup); - plugin.permission.playerAddGroup(player, realGroup); + plugin.vaultGroupManagement.playerRemoveGroup(player, currentGroup); + plugin.vaultGroupManagement.playerAddGroup(player, realGroup); break; } } @@ -152,15 +152,15 @@ public class Utils { if (!useGroupSystem()) { return false; } - if (plugin.permission == null) + if (plugin.vaultGroupManagement == null) return false; try { - if (plugin.permission.playerRemoveGroup(player, Settings.getUnloggedinGroup) && plugin.permission.playerAddGroup(player, group)) { + if (plugin.vaultGroupManagement.playerRemoveGroup(player, Settings.getUnloggedinGroup) && plugin.vaultGroupManagement.playerAddGroup(player, group)) { return true; } } catch (UnsupportedOperationException e) { - ConsoleLogger.showError("Your permission system (" + plugin.permission.getName() + ") do not support Group system with that config... unhook!"); - plugin.permission = null; + ConsoleLogger.showError("Your permission system (" + plugin.vaultGroupManagement.getName() + ") do not support Group system with that config... unhook!"); + plugin.vaultGroupManagement = null; return false; } return false;