And I did it again

This commit is contained in:
Svenja Reissaus
2018-08-28 12:06:26 -03:00
parent a6174f026b
commit 9ce8467224
4 changed files with 19 additions and 23 deletions

View File

@@ -47,9 +47,9 @@ public abstract class FCommand extends MCommand<P> {
}
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<P> {
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;
}