Revert "WIP: Access method for commands"

This reverts commit 9c6cc187f2.
2018-09-08 17:28:09 -05:00
parent 9a773702eb
commit 90ae1822bc
21 changed files with 66 additions and 111 deletions
--- a/src/main/java/com/massivecraft/factions/cmd/CmdFWarp.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdFWarp.java
@@ -31,9 +31,12 @@ public class CmdFWarp extends FCommand {
    @Override
    public void perform() {
        //TODO: check if in combat.
-        if (!this.hasAccess(PermissableAction.WARP)) {
-            fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "use warps");
-            return;
+        if (!fme.isAdminBypassing()) {
+            Access access = myFaction.getAccess(fme, PermissableAction.WARP);
+            if (access != Access.ALLOW && fme.getRole() != Role.ADMIN) {
+                fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "use warps");
+                return;
+            }
        }