SpigotMC/Saber-Factions
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reverted MCommand because 9ce8467224 commit broke it :/

Browse Source
This commit is contained in:
ProSavage 2018-09-02 19:36:37 -05:00
parent 262ca66437
commit ef2ab6b4c6
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/com/massivecraft/factions/zcore/MCommand.java
View File

@ -99,25 +99,27 @@ public abstract class MCommand<T extends MPlugin> {
} }
this.args = args; this.args = args;
this.commandChain = commandChain; this.commandChain = commandChain;
if (validCall(this.sender, this.args)) {
// This is always true but anyway // Is there a matching sub command?
if (!this.isEnabled()) { if (args.size() > 0) {
return; for (MCommand<?> subCommand : this.subCommands) {
} if (subCommand.aliases.contains(args.get(0).toLowerCase())) {
// Is there a matching sub command? args.remove(0);
if (args.size() > 0) { commandChain.add(this);
for (MCommand<?> subCommand : this.subCommands) { subCommand.execute(sender, args, commandChain);
if (subCommand.aliases.contains(args.get(0).toLowerCase())) { return;
args.remove(0);
commandChain.add(this);
subCommand.execute(sender, args, commandChain);
return;
}
} }
} }
} else { }
if (!validCall(this.sender, this.args)) {
return; return;
} }
if (!this.isEnabled()) {
return;
}
perform(); perform();
} }
@ -471,4 +473,4 @@ public abstract class MCommand<T extends MPlugin> {
public Player argAsBestPlayerMatch(int idx) { public Player argAsBestPlayerMatch(int idx) {
return this.argAsPlayer(idx, null); return this.argAsPlayer(idx, null);
} }
} }