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

🐛 Fix suggestions in console (Bukkit/Paper)

Browse source
This commit is contained in:
jmp 2020-12-31 15:19:24 -08:00 • committed by Alexander Söderberg
parent a978adc79f
commit d812ea633a
3 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -107,6 +107,7 @@ local.properties
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid* hs_err_pid*
java_pid*
### JetBrains+all ### ### JetBrains+all ###
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider

12
cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/CloudBukkitListener.java
View file

@ -44,15 +44,19 @@ final class CloudBukkitListener<C> implements Listener {
@EventHandler @EventHandler
void onTabCompletion(final @NonNull TabCompleteEvent event) { void onTabCompletion(final @NonNull TabCompleteEvent event) {
if (event.getBuffer().isEmpty() || !event.getBuffer().startsWith("/")) { if (event.getBuffer().isEmpty()) {
return; return;
} }
@SuppressWarnings("unchecked") final BukkitPluginRegistrationHandler<C> bukkitPluginRegistrationHandler = @SuppressWarnings("unchecked")
final BukkitPluginRegistrationHandler<C> bukkitPluginRegistrationHandler =
(BukkitPluginRegistrationHandler<C>) this.bukkitCommandManager.getCommandRegistrationHandler(); (BukkitPluginRegistrationHandler<C>) this.bukkitCommandManager.getCommandRegistrationHandler();
/* Turn '/plugin:command arg1 arg2 ...' into 'plugin:command' */ /* Turn '(/)plugin:command arg1 arg2 ...' into 'plugin:command' */
final String commandLabel = event.getBuffer().substring(1).split(" ")[0]; final String commandLabel = (event.getBuffer().startsWith("/")
? event.getBuffer().substring(1)
: event.getBuffer())
.split(" ")[0];
if (!bukkitPluginRegistrationHandler.isRecognized(commandLabel)) { if (!bukkitPluginRegistrationHandler.isRecognized(commandLabel)) {
return; return;
} }

9
cloud-minecraft/cloud-paper/src/main/java/cloud/commandframework/paper/AsyncCommandSuggestionsListener.java
View file

@ -43,7 +43,7 @@ final class AsyncCommandSuggestionsListener<C> implements Listener {
@EventHandler @EventHandler
void onTabCompletion(final @NonNull AsyncTabCompleteEvent event) { void onTabCompletion(final @NonNull AsyncTabCompleteEvent event) {
if (event.getBuffer().isEmpty() || !event.getBuffer().startsWith("/")) { if (event.getBuffer().isEmpty()) {
return; return;
} }
@ -51,8 +51,11 @@ final class AsyncCommandSuggestionsListener<C> implements Listener {
final BukkitPluginRegistrationHandler<C> bukkitPluginRegistrationHandler = final BukkitPluginRegistrationHandler<C> bukkitPluginRegistrationHandler =
(BukkitPluginRegistrationHandler<C>) this.paperCommandManager.getCommandRegistrationHandler(); (BukkitPluginRegistrationHandler<C>) this.paperCommandManager.getCommandRegistrationHandler();
/* Turn '/plugin:command arg1 arg2 ...' into 'plugin:command' */ /* Turn '(/)plugin:command arg1 arg2 ...' into 'plugin:command' */
final String commandLabel = event.getBuffer().substring(1).split(" ")[0]; final String commandLabel = (event.getBuffer().startsWith("/")
? event.getBuffer().substring(1)
: event.getBuffer())
.split(" ")[0];
if (!bukkitPluginRegistrationHandler.isRecognized(commandLabel)) { if (!bukkitPluginRegistrationHandler.isRecognized(commandLabel)) {
return; return;
} }