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
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -99,11 +99,7 @@ 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
if (!this.isEnabled()) {
return;
}
// Is there a matching sub command? // Is there a matching sub command?
if (args.size() > 0) { if (args.size() > 0) {
for (MCommand<?> subCommand : this.subCommands) { for (MCommand<?> subCommand : this.subCommands) {
@@ -115,9 +111,15 @@ public abstract class MCommand<T extends MPlugin> {
} }
} }
} }
} else {
if (!validCall(this.sender, this.args)) {
return; return;
} }
if (!this.isEnabled()) {
return;
}
perform(); perform();
} }