{ } public boolean hasAccess() { - if (this.permission == null || this.fme == null) return false; + if (this.actionPermission == null || this.fme == null) return false; if (!this.fme.isAdminBypassing()) { - Access access = myFaction.getAccess(this.fme, permission); + Access access = myFaction.getAccess(this.fme, this.actionPermission); if (access != Access.ALLOW && this.fme.getRole() != Role.ADMIN) { return false; } @@ -57,9 +57,9 @@ public abstract class FCommand extends MCommand
{
return true;
}
public boolean hasAccess(boolean checkifAdmin) {
- if (this.permission == null || this.fme == null) return false;
+ if (this.actionPermission == null || this.fme == null) return false;
if (!this.fme.isAdminBypassing() && checkifAdmin) {
- Access access = myFaction.getAccess(this.fme, permission);
+ Access access = myFaction.getAccess(this.fme, this.actionPermission);
if (access != Access.ALLOW && this.fme.getRole() != Role.ADMIN) {
return false;
}
diff --git a/src/main/java/com/massivecraft/factions/zcore/MCommand.java b/src/main/java/com/massivecraft/factions/zcore/MCommand.java
index 309023a2..713a0e6e 100644
--- a/src/main/java/com/massivecraft/factions/zcore/MCommand.java
+++ b/src/main/java/com/massivecraft/factions/zcore/MCommand.java
@@ -99,27 +99,25 @@ public abstract class MCommand