From 7c3371819014d9b03edf2bf245152e914f7176fe Mon Sep 17 00:00:00 2001 From: YouHaveTrouble Date: Wed, 1 Sep 2021 17:51:45 +0200 Subject: [PATCH] fail early if async suggestions empty --- .../bukkit/listeners/AsyncTabCompleteBlockerListener.java | 1 + .../bukkit/listeners/TabCompleteBlockerListener.java | 1 + 2 files changed, 2 insertions(+) diff --git a/CommandWhitelistBukkit/src/main/java/eu/endermite/commandwhitelist/bukkit/listeners/AsyncTabCompleteBlockerListener.java b/CommandWhitelistBukkit/src/main/java/eu/endermite/commandwhitelist/bukkit/listeners/AsyncTabCompleteBlockerListener.java index bc3ba8d..224618c 100644 --- a/CommandWhitelistBukkit/src/main/java/eu/endermite/commandwhitelist/bukkit/listeners/AsyncTabCompleteBlockerListener.java +++ b/CommandWhitelistBukkit/src/main/java/eu/endermite/commandwhitelist/bukkit/listeners/AsyncTabCompleteBlockerListener.java @@ -17,6 +17,7 @@ public class AsyncTabCompleteBlockerListener implements Listener { if (!(event.getSender() instanceof Player)) return; Player player = (Player) event.getSender(); if (player.hasPermission(CWPermission.BYPASS.permission())) return; + if (event.getCompletions().isEmpty()) return; String buffer = event.getBuffer(); if (!buffer.endsWith(" ") && buffer.split(" ").length == 1) event.setCancelled(true); event.setCompletions(CommandUtil.filterSuggestions(buffer, event.getCompletions(), CommandWhitelistBukkit.getSuggestions(player))); diff --git a/CommandWhitelistBukkit/src/main/java/eu/endermite/commandwhitelist/bukkit/listeners/TabCompleteBlockerListener.java b/CommandWhitelistBukkit/src/main/java/eu/endermite/commandwhitelist/bukkit/listeners/TabCompleteBlockerListener.java index 2321601..6c1f661 100644 --- a/CommandWhitelistBukkit/src/main/java/eu/endermite/commandwhitelist/bukkit/listeners/TabCompleteBlockerListener.java +++ b/CommandWhitelistBukkit/src/main/java/eu/endermite/commandwhitelist/bukkit/listeners/TabCompleteBlockerListener.java @@ -16,6 +16,7 @@ public class TabCompleteBlockerListener implements Listener { if (!(event.getSender() instanceof Player)) return; Player player = (Player) event.getSender(); if (player.hasPermission(CWPermission.BYPASS.permission())) return; + if (event.getCompletions().isEmpty()) return; String buffer = event.getBuffer(); if (!buffer.endsWith(" ") && buffer.split(" ").length == 1) event.setCancelled(true); event.setCompletions(