diff --git a/cloud-core/src/main/java/com/intellectualsites/commands/CommandManager.java b/cloud-core/src/main/java/com/intellectualsites/commands/CommandManager.java index 4721c944..d2578caa 100644 --- a/cloud-core/src/main/java/com/intellectualsites/commands/CommandManager.java +++ b/cloud-core/src/main/java/com/intellectualsites/commands/CommandManager.java @@ -199,7 +199,8 @@ public abstract class CommandManager { } /** - * 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 permission Permission node diff --git a/cloud-minecraft/cloud-bukkit-test/src/main/java/com/intellectualsites/commands/BukkitTest.java b/cloud-minecraft/cloud-bukkit-test/src/main/java/com/intellectualsites/commands/BukkitTest.java index d95c8b52..fc170e82 100644 --- a/cloud-minecraft/cloud-bukkit-test/src/main/java/com/intellectualsites/commands/BukkitTest.java +++ b/cloud-minecraft/cloud-bukkit-test/src/main/java/com/intellectualsites/commands/BukkitTest.java @@ -123,14 +123,6 @@ public final class BukkitTest extends JavaPlugin { )); }) .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") .argument(UUID.class, "uuid", builder -> builder .asRequired() diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/com/intellectualsites/commands/bukkit/BukkitCommandManager.java b/cloud-minecraft/cloud-bukkit/src/main/java/com/intellectualsites/commands/bukkit/BukkitCommandManager.java index 266089fe..f6b4b78f 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/com/intellectualsites/commands/bukkit/BukkitCommandManager.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/com/intellectualsites/commands/bukkit/BukkitCommandManager.java @@ -146,6 +146,9 @@ public class BukkitCommandManager extends CommandManager { @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); } diff --git a/cloud-minecraft/cloud-bungee/src/main/java/com/intellectualsites/commands/bungee/BungeeCommandManager.java b/cloud-minecraft/cloud-bungee/src/main/java/com/intellectualsites/commands/bungee/BungeeCommandManager.java index d9bd7d77..87fb0954 100644 --- a/cloud-minecraft/cloud-bungee/src/main/java/com/intellectualsites/commands/bungee/BungeeCommandManager.java +++ b/cloud-minecraft/cloud-bungee/src/main/java/com/intellectualsites/commands/bungee/BungeeCommandManager.java @@ -64,6 +64,9 @@ public class BungeeCommandManager extends CommandManager { @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); } diff --git a/cloud-minecraft/cloud-velocity-test/src/main/java/com/intellectualsites/cloudvelocitytest/CloudVelocityTest.java b/cloud-minecraft/cloud-velocity-test/src/main/java/com/intellectualsites/cloudvelocitytest/CloudVelocityTest.java index 048193eb..4a24ba60 100644 --- a/cloud-minecraft/cloud-velocity-test/src/main/java/com/intellectualsites/cloudvelocitytest/CloudVelocityTest.java +++ b/cloud-minecraft/cloud-velocity-test/src/main/java/com/intellectualsites/cloudvelocitytest/CloudVelocityTest.java @@ -79,14 +79,14 @@ public class CloudVelocityTest { } @CommandMethod("test [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, @Argument("num") @Range(min = "10", max = "33") final int num) { source.sendMessage(TextComponent.builder() .append("You wrote: ", NamedTextColor.GOLD) - .append(string, NamedTextColor.LIGHT_PURPLE) + .append(string, NamedTextColor.RED) .append(" and ", NamedTextColor.GOLD) - .append(Integer.toString(num), NamedTextColor.LIGHT_PURPLE) + .append(Integer.toString(num), NamedTextColor.RED) .append("!", NamedTextColor.GOLD) ); } diff --git a/cloud-minecraft/cloud-velocity/src/main/java/com/intellectualsites/commands/velocity/VelocityCommandManager.java b/cloud-minecraft/cloud-velocity/src/main/java/com/intellectualsites/commands/velocity/VelocityCommandManager.java index 88848ef3..7bfa6d62 100644 --- a/cloud-minecraft/cloud-velocity/src/main/java/com/intellectualsites/commands/velocity/VelocityCommandManager.java +++ b/cloud-minecraft/cloud-velocity/src/main/java/com/intellectualsites/commands/velocity/VelocityCommandManager.java @@ -67,6 +67,9 @@ public class VelocityCommandManager extends CommandManager { @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); }