From 1ad148eb88e3760993eb4a6ebde0e61c0159cb30 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 7 Jan 2017 14:44:10 -0500 Subject: [PATCH] don't run precommand on unknown commands --- src/main/java/co/aikar/commands/BaseCommand.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/co/aikar/commands/BaseCommand.java b/src/main/java/co/aikar/commands/BaseCommand.java index ff617783..2e3a5f7d 100644 --- a/src/main/java/co/aikar/commands/BaseCommand.java +++ b/src/main/java/co/aikar/commands/BaseCommand.java @@ -189,15 +189,15 @@ public abstract class BaseCommand extends Command { return true; } commandLabel = commandLabel.toLowerCase(); - if (preCommand(sender, commandLabel, args)) { - return true; - } execSubcommand = null; execLabel = commandLabel; origArgs = args; if (args.length == 0) { + if (preCommand(sender, commandLabel, args)) { + return true; + } onDefault(sender, commandLabel); return true; } @@ -206,6 +206,9 @@ public abstract class BaseCommand extends Command { if (cmd != null) { execSubcommand = cmd.getCheckSub(); final String[] execargs = Arrays.copyOfRange(args, cmd.argIndex, args.length); + if (preCommand(sender, commandLabel, execargs)) { + return true; + } executeCommand(sender, execargs, cmd.cmd); return true; }