From d812ea633aaa60f39ea736e608b25be0ffa97e32 Mon Sep 17 00:00:00 2001
From: jmp <jasonpenilla2@me.com>
Date: Thu, 31 Dec 2020 15:19:24 -0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20suggestions=20in=20console?=
 =?UTF-8?q?=20(Bukkit/Paper)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                           |  1 +
 .../commandframework/bukkit/CloudBukkitListener.java | 12 ++++++++----
 .../paper/AsyncCommandSuggestionsListener.java       |  9 ++++++---
 3 files changed, 15 insertions(+), 7 deletions(-)

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<C> 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<C> bukkitPluginRegistrationHandler =
+        @SuppressWarnings("unchecked")
+        final BukkitPluginRegistrationHandler<C> bukkitPluginRegistrationHandler =
                 (BukkitPluginRegistrationHandler<C>) 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<C> 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<C> implements Listener {
         final BukkitPluginRegistrationHandler<C> bukkitPluginRegistrationHandler =
                 (BukkitPluginRegistrationHandler<C>) 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;
         }