Fix some velocity related issues

This commit is contained in:
Alexander Söderberg 2020-09-20 17:09:48 +02:00
parent 1c831a3bcf
commit 0ccf8d37e6
No known key found for this signature in database
GPG key ID: C0207FF7EA146678
6 changed files with 14 additions and 12 deletions

View file

@ -199,7 +199,8 @@ public abstract class CommandManager<C> {
} }
/** /**
* Check if the command sender has the required permission * Check if the command sender has the required permission. If the permission node is
* empty, this should return {@code true}
* *
* @param sender Command sender * @param sender Command sender
* @param permission Permission node * @param permission Permission node

View file

@ -123,14 +123,6 @@ public final class BukkitTest extends JavaPlugin {
)); ));
}) })
.build()) .build())
.command(mgr.commandBuilder("test")
.literal("one")
.handler(c -> c.getSender().sendMessage("One!"))
.build())
.command(mgr.commandBuilder("test")
.literal("two")
.handler(c -> c.getSender().sendMessage("Two!"))
.build())
.command(mgr.commandBuilder("uuidtest") .command(mgr.commandBuilder("uuidtest")
.argument(UUID.class, "uuid", builder -> builder .argument(UUID.class, "uuid", builder -> builder
.asRequired() .asRequired()

View file

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

View file

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

View file

@ -79,14 +79,14 @@ public class CloudVelocityTest {
} }
@CommandMethod("test <num> [str]") @CommandMethod("test <num> [str]")
private void testCommand(@Nonnull @Argument("str") final String string, private void testCommand(@Nonnull @Argument(value = "str", defaultValue = "potato") final String string,
@Nonnull final CommandSource source, @Nonnull final CommandSource source,
@Argument("num") @Range(min = "10", max = "33") final int num) { @Argument("num") @Range(min = "10", max = "33") final int num) {
source.sendMessage(TextComponent.builder() source.sendMessage(TextComponent.builder()
.append("You wrote: ", NamedTextColor.GOLD) .append("You wrote: ", NamedTextColor.GOLD)
.append(string, NamedTextColor.LIGHT_PURPLE) .append(string, NamedTextColor.RED)
.append(" and ", NamedTextColor.GOLD) .append(" and ", NamedTextColor.GOLD)
.append(Integer.toString(num), NamedTextColor.LIGHT_PURPLE) .append(Integer.toString(num), NamedTextColor.RED)
.append("!", NamedTextColor.GOLD) .append("!", NamedTextColor.GOLD)
); );
} }

View file

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