diff --git a/classes/artifacts/Factions_jar/Factions.jar b/classes/artifacts/Factions_jar/Factions.jar index 1487877f..eb501b7c 100644 Binary files a/classes/artifacts/Factions_jar/Factions.jar and b/classes/artifacts/Factions_jar/Factions.jar differ diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFly.java b/src/main/java/com/massivecraft/factions/cmd/CmdFly.java index fdf529f7..8cacd12b 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFly.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdFly.java @@ -214,8 +214,6 @@ public class CmdFly extends FCommand { return; } } - - List entities = me.getNearbyEntities(16, 256, 16); for (int i = 0; i <= entities.size() - 1; i++) { if (entities.get(i) instanceof Player) { diff --git a/src/main/java/com/massivecraft/factions/cmd/FCommand.java b/src/main/java/com/massivecraft/factions/cmd/FCommand.java index d6bbc796..0d81676e 100644 --- a/src/main/java/com/massivecraft/factions/cmd/FCommand.java +++ b/src/main/java/com/massivecraft/factions/cmd/FCommand.java @@ -47,9 +47,9 @@ public abstract class FCommand extends MCommand

{ } 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 { } this.args = args; this.commandChain = commandChain; - - // Is there a matching sub command? - if (args.size() > 0) { - for (MCommand subCommand : this.subCommands) { - if (subCommand.aliases.contains(args.get(0).toLowerCase())) { - args.remove(0); - commandChain.add(this); - subCommand.execute(sender, args, commandChain); - return; + if (validCall(this.sender, this.args)) { + // This is always true but anyway + if (!this.isEnabled()) { + return; + } + // Is there a matching sub command? + if (args.size() > 0) { + for (MCommand subCommand : this.subCommands) { + if (subCommand.aliases.contains(args.get(0).toLowerCase())) { + args.remove(0); + commandChain.add(this); + subCommand.execute(sender, args, commandChain); + return; + } } } - } - - if (!validCall(this.sender, this.args)) { + } else { return; } - - if (!this.isEnabled()) { - return; - } - perform(); }