diff --git a/.gitignore b/.gitignore index 70bf19e2..87e6dabb 100644 --- a/.gitignore +++ b/.gitignore @@ -107,6 +107,7 @@ local.properties # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* +java_pid* ### JetBrains+all ### # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/CloudBukkitListener.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/CloudBukkitListener.java index 5d677110..9a842679 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/CloudBukkitListener.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/CloudBukkitListener.java @@ -44,15 +44,19 @@ final class CloudBukkitListener implements Listener { @EventHandler void onTabCompletion(final @NonNull TabCompleteEvent event) { - if (event.getBuffer().isEmpty() || !event.getBuffer().startsWith("/")) { + if (event.getBuffer().isEmpty()) { return; } - @SuppressWarnings("unchecked") final BukkitPluginRegistrationHandler bukkitPluginRegistrationHandler = + @SuppressWarnings("unchecked") + final BukkitPluginRegistrationHandler bukkitPluginRegistrationHandler = (BukkitPluginRegistrationHandler) this.bukkitCommandManager.getCommandRegistrationHandler(); - /* Turn '/plugin:command arg1 arg2 ...' into 'plugin:command' */ - final String commandLabel = event.getBuffer().substring(1).split(" ")[0]; + /* Turn '(/)plugin:command arg1 arg2 ...' into 'plugin:command' */ + final String commandLabel = (event.getBuffer().startsWith("/") + ? event.getBuffer().substring(1) + : event.getBuffer()) + .split(" ")[0]; if (!bukkitPluginRegistrationHandler.isRecognized(commandLabel)) { return; } diff --git a/cloud-minecraft/cloud-paper/src/main/java/cloud/commandframework/paper/AsyncCommandSuggestionsListener.java b/cloud-minecraft/cloud-paper/src/main/java/cloud/commandframework/paper/AsyncCommandSuggestionsListener.java index f2ed6f90..774bbde8 100644 --- a/cloud-minecraft/cloud-paper/src/main/java/cloud/commandframework/paper/AsyncCommandSuggestionsListener.java +++ b/cloud-minecraft/cloud-paper/src/main/java/cloud/commandframework/paper/AsyncCommandSuggestionsListener.java @@ -43,7 +43,7 @@ final class AsyncCommandSuggestionsListener implements Listener { @EventHandler void onTabCompletion(final @NonNull AsyncTabCompleteEvent event) { - if (event.getBuffer().isEmpty() || !event.getBuffer().startsWith("/")) { + if (event.getBuffer().isEmpty()) { return; } @@ -51,8 +51,11 @@ final class AsyncCommandSuggestionsListener implements Listener { final BukkitPluginRegistrationHandler bukkitPluginRegistrationHandler = (BukkitPluginRegistrationHandler) this.paperCommandManager.getCommandRegistrationHandler(); - /* Turn '/plugin:command arg1 arg2 ...' into 'plugin:command' */ - final String commandLabel = event.getBuffer().substring(1).split(" ")[0]; + /* Turn '(/)plugin:command arg1 arg2 ...' into 'plugin:command' */ + final String commandLabel = (event.getBuffer().startsWith("/") + ? event.getBuffer().substring(1) + : event.getBuffer()) + .split(" ")[0]; if (!bukkitPluginRegistrationHandler.isRecognized(commandLabel)) { return; }