zhdev/oblak
1
0
Fork 0
Code Issues Pull requests Activity

🐛 Fix command registration for Velocity

Browse source 
We need to recreate the Brigadier command node each time a command is extended, and the code was only letting each command get registered once.
This commit is contained in:
Alexander Söderberg 2020-09-26 17:28:35 +02:00 • committed by Alexander Söderberg
parent 0d44a8c944
commit 7036beb8ad
4 changed files with 12 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cloud-minecraft/cloud-velocity/src/main/java/com/intellectualsites/commands/velocity/VelocityCommandManager.java
View file

@ -67,9 +67,6 @@ public class VelocityCommandManager<C> extends CommandManager<C> {
@Override
public final boolean hasPermission(@Nonnull final C sender, @Nonnull final String permission) {
if (permission.isEmpty()) {
return true;
}
return this.backwardsCommandSenderMapper.apply(sender).hasPermission(permission);
}

8
cloud-minecraft/cloud-velocity/src/main/java/com/intellectualsites/commands/velocity/VelocityPluginRegistrationHandler.java
View file

@ -41,9 +41,7 @@ import net.kyori.adventure.text.TextComponent;
import net.kyori.adventure.text.format.NamedTextColor;
import javax.annotation.Nonnull;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CompletionException;
final class VelocityPluginRegistrationHandler<C> implements CommandRegistrationHandler {
@ -53,7 +51,6 @@ final class VelocityPluginRegistrationHandler<C> implements CommandRegistrationH
+ "Please contact the server administrators if you believe that this is in error.";
private static final String MESSAGE_UNKNOWN_COMMAND = "Unknown command. Type \"/help\" for help.";
private final Map<CommandArgument<?, ?>, BrigadierCommand> registeredCommands = new HashMap<>();
private CloudBrigadierManager<C, CommandSource> brigadierManager;
private VelocityCommandManager<C> manager;
@ -70,9 +67,6 @@ final class VelocityPluginRegistrationHandler<C> implements CommandRegistrationH
@Override
public boolean registerCommand(@Nonnull final Command<?> command) {
final CommandArgument<?, ?> argument = command.getArguments().get(0);
if (this.registeredCommands.containsKey(argument)) {
return false;
}
final List<String> aliases = ((StaticArgument<C>) argument).getAlternativeAliases();
final BrigadierCommand brigadierCommand = new BrigadierCommand(
this.brigadierManager.createLiteralCommandNode(command.getArguments().get(0).getName(), (Command<C>) command,
@ -137,8 +131,8 @@ final class VelocityPluginRegistrationHandler<C> implements CommandRegistrationH
final CommandMeta commandMeta = this.manager.getProxyServer().getCommandManager()
.metaBuilder(brigadierCommand)
.aliases(aliases.toArray(new String[0])).build();
aliases.forEach(this.manager.getProxyServer().getCommandManager()::unregister);
this.manager.getProxyServer().getCommandManager().register(commandMeta, brigadierCommand);
this.registeredCommands.put(argument, brigadierCommand);
return true;
}