From 6a7766e35d16ba6655e8fe61819aa176fea02b8f Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 25 Feb 2019 22:46:48 -0500 Subject: [PATCH] Fix command routing for forwarding commands completions still funky, but least get execution working --- core/src/main/java/co/aikar/commands/CommandRouter.java | 4 ---- core/src/main/java/co/aikar/commands/ForwardingCommand.java | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/co/aikar/commands/CommandRouter.java b/core/src/main/java/co/aikar/commands/CommandRouter.java index e7b2ac53..b85a538b 100644 --- a/core/src/main/java/co/aikar/commands/CommandRouter.java +++ b/core/src/main/java/co/aikar/commands/CommandRouter.java @@ -138,10 +138,6 @@ class CommandRouter { this(cmd, search.args, search.subcommand, search.commandLabel); } - CommandRouteResult(CommandRouteResult result, String[] args) { - this(result.cmd, args, result.subcommand, result.commandLabel); - } - CommandRouteResult(RegisteredCommand cmd, String[] args, String subcommand, String commandLabel) { this.cmd = cmd; this.args = args; diff --git a/core/src/main/java/co/aikar/commands/ForwardingCommand.java b/core/src/main/java/co/aikar/commands/ForwardingCommand.java index 6274c791..8c56fcf3 100644 --- a/core/src/main/java/co/aikar/commands/ForwardingCommand.java +++ b/core/src/main/java/co/aikar/commands/ForwardingCommand.java @@ -40,6 +40,7 @@ public class ForwardingCommand extends BaseCommand { this.command = baseCommand; this.baseArgs = baseArgs; this.manager = baseCommand.manager; + this.subCommands.put(DEFAULT, regCommand); } @Override @@ -79,7 +80,7 @@ public class ForwardingCommand extends BaseCommand { @Override public void execute(CommandIssuer issuer, CommandRouter.CommandRouteResult result) { - result = new CommandRouter.CommandRouteResult(result, ApacheCommonsLangUtil.addAll(baseArgs, result.args)); + result = new CommandRouter.CommandRouteResult(regCommand, result.args, ACFUtil.join(baseArgs), result.commandLabel); command.execute(issuer, result); }