diff --git a/velocity/src/main/java/co/aikar/commands/VelocityCommandManager.java b/velocity/src/main/java/co/aikar/commands/VelocityCommandManager.java index fa94b802..86415f75 100644 --- a/velocity/src/main/java/co/aikar/commands/VelocityCommandManager.java +++ b/velocity/src/main/java/co/aikar/commands/VelocityCommandManager.java @@ -31,6 +31,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import com.velocitypowered.api.command.CommandMeta; import net.kyori.adventure.text.format.TextColor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -133,7 +134,8 @@ public class VelocityCommandManager extends if (force) { proxy.getCommandManager().unregister(commandName); } - proxy.getCommandManager().register(commandName, velocityCommand); + CommandMeta meta = proxy.getCommandManager().metaBuilder(commandName).build(); + proxy.getCommandManager().register(meta, velocityCommand); } velocityCommand.isRegistered = true; registeredCommands.put(commandName, velocityCommand); diff --git a/velocity/src/main/java/co/aikar/commands/VelocityRootCommand.java b/velocity/src/main/java/co/aikar/commands/VelocityRootCommand.java index f3bbed84..e2612833 100644 --- a/velocity/src/main/java/co/aikar/commands/VelocityRootCommand.java +++ b/velocity/src/main/java/co/aikar/commands/VelocityRootCommand.java @@ -30,8 +30,9 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.SetMultimap; import com.velocitypowered.api.command.Command; import com.velocitypowered.api.command.CommandSource; +import com.velocitypowered.api.command.SimpleCommand; -public class VelocityRootCommand implements Command, RootCommand { +public class VelocityRootCommand implements Command, RootCommand, SimpleCommand { private final VelocityCommandManager manager; private final String name; @@ -86,4 +87,9 @@ public class VelocityRootCommand implements Command, RootCommand { public BaseCommand getDefCommand() { return defCommand; } + + @Override + public void execute(Invocation invocation) { + execute(invocation.source(), invocation.arguments()); + } }