Reverted MCommand because 9ce8467224
commit broke it :/
This commit is contained in:
parent
262ca66437
commit
ef2ab6b4c6
@ -99,25 +99,27 @@ public abstract class MCommand<T extends MPlugin> {
|
||||
}
|
||||
this.args = args;
|
||||
this.commandChain = commandChain;
|
||||
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;
|
||||
}
|
||||
|
||||
// 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;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
}
|
||||
|
||||
if (!validCall(this.sender, this.args)) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (!this.isEnabled()) {
|
||||
return;
|
||||
}
|
||||
|
||||
perform();
|
||||
}
|
||||
|
||||
@ -471,4 +473,4 @@ public abstract class MCommand<T extends MPlugin> {
|
||||
public Player argAsBestPlayerMatch(int idx) {
|
||||
return this.argAsPlayer(idx, null);
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user