Merge branch '314-permissions-manager-refactor' of https://github.com/AuthMe-Team/AuthMeReloaded

2016-06-01 23:39:14 +02:00
parent 38db2ef0bd 95343e366b
commit 7fd1ac0856
11 changed files with 620 additions and 378 deletions
@@ -48,7 +48,7 @@ public class HelpProvider implements SettingsDependent {
    private String helpHeader;

    @Inject
-    public HelpProvider(PermissionsManager permissionsManager, NewSetting settings) {
+    HelpProvider(PermissionsManager permissionsManager, NewSetting settings) {
        this.permissionsManager = permissionsManager;
        loadSettings(settings);
    }
@@ -152,7 +152,7 @@ public class HelpProvider implements SettingsDependent {
        final DefaultPermission defaultPermission = permission.getDefaultPermission();
        String addendum = "";
        if (DefaultPermission.OP_ONLY.equals(defaultPermission)) {
-            addendum = PermissionsManager.evaluateDefaultPermission(defaultPermission, sender)
+            addendum = defaultPermission.evaluate(sender)
                ? " (You have permission)"
                : " (No permission)";
        }