From a9f203b5ef3b8d774ef8d7c7264158482772da1e Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 28 Sep 2017 22:50:09 -0400 Subject: [PATCH] Unknown Handlers should have priority over default. Both conflict with each other to support parameters on @Default --- core/src/main/java/co/aikar/commands/BaseCommand.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/co/aikar/commands/BaseCommand.java b/core/src/main/java/co/aikar/commands/BaseCommand.java index eeed90fd..c051dfc4 100644 --- a/core/src/main/java/co/aikar/commands/BaseCommand.java +++ b/core/src/main/java/co/aikar/commands/BaseCommand.java @@ -323,14 +323,15 @@ public abstract class BaseCommand { } } - if (subCommands.get(DEFAULT) != null) { + + if (subCommands.get(UNKNOWN) != null) { + if (!executeSubcommand(commandContext, UNKNOWN, issuer, args)) { + help(issuer, args); + } + } else if (subCommands.get(DEFAULT) != null) { executeSubcommand(commandContext, DEFAULT, issuer, args); - return; } - if (!executeSubcommand(commandContext, UNKNOWN, issuer, args)) { - help(issuer, args); - } } finally { postCommandOperation(); }