From 1b370b3bd9a0760f36e8578c64b17164fe6c002d Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 17 May 2017 23:18:26 -0400 Subject: [PATCH] Fix root commands on 2nd+ classes - Fixes #36 --- core/src/main/java/co/aikar/commands/BaseCommand.java | 2 +- .../main/java/co/aikar/commands/ForwardingCommand.java | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/core/src/main/java/co/aikar/commands/BaseCommand.java b/core/src/main/java/co/aikar/commands/BaseCommand.java index 7dd6e281..981986d5 100644 --- a/core/src/main/java/co/aikar/commands/BaseCommand.java +++ b/core/src/main/java/co/aikar/commands/BaseCommand.java @@ -187,7 +187,7 @@ public class BaseCommand extends Command { Collections.addAll(cmdList, ACFPatterns.PIPE.split(rootCmdAlias.value().toLowerCase())); cmdList.remove(cmd); for (String cmdAlias : cmdList) { - register(cmdAlias, new ForwardingCommand(this)); + register(cmdAlias, this); } } diff --git a/core/src/main/java/co/aikar/commands/ForwardingCommand.java b/core/src/main/java/co/aikar/commands/ForwardingCommand.java index 2c17edbd..df84f825 100644 --- a/core/src/main/java/co/aikar/commands/ForwardingCommand.java +++ b/core/src/main/java/co/aikar/commands/ForwardingCommand.java @@ -30,15 +30,11 @@ import org.bukkit.command.CommandSender; import java.util.List; public class ForwardingCommand extends BaseCommand { - private final Command command; + private final BaseCommand command; private final String[] baseArgs; private static final String[] NO_ARGS = new String[0]; - public ForwardingCommand(Command command) { - this(command, NO_ARGS); - } - - public ForwardingCommand(Command command, String[] baseArgs) { + ForwardingCommand(BaseCommand command, String[] baseArgs) { super(command.getName()); this.command = command; this.baseArgs = baseArgs;