From aff390369f84f13687730bbbfba9eeb27d4b1f3c Mon Sep 17 00:00:00 2001 From: kforbro Date: Sun, 10 Oct 2021 19:15:23 +0300 Subject: [PATCH 1/3] fix useProtocolLib --- .../java/eu/endermite/commandwhitelist/common/ConfigCache.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CommandWhitelistCommon/src/main/java/eu/endermite/commandwhitelist/common/ConfigCache.java b/CommandWhitelistCommon/src/main/java/eu/endermite/commandwhitelist/common/ConfigCache.java index 31b8b0f..7bfc702 100644 --- a/CommandWhitelistCommon/src/main/java/eu/endermite/commandwhitelist/common/ConfigCache.java +++ b/CommandWhitelistCommon/src/main/java/eu/endermite/commandwhitelist/common/ConfigCache.java @@ -16,7 +16,7 @@ public class ConfigCache { private final HashMap groupList = new LinkedHashMap<>(); public String prefix, command_denied, no_permission, no_such_subcommand, config_reloaded, added_to_whitelist, removed_from_whitelist, group_doesnt_exist, subcommand_denied; - public boolean useProtocolLib = false; + public boolean useProtocolLib; public ConfigCache(File configFile, boolean canDoProtocolLib, Object logger) { this.configFile = configFile; @@ -86,6 +86,7 @@ public class ConfigCache { added_to_whitelist = config.getString("messages.added_to_whitelist"); removed_from_whitelist = config.getString("messages.removed_from_whitelist"); group_doesnt_exist = config.getString("messages.group_doesnt_exist"); + useProtocolLib = config.getBoolean("use_protocollib"); ConfigSection groupSection = config.getConfigSection("groups"); for (String key : groupSection.getKeys(false)) { From 1647605682ec2b3b387e0f5767b700589f66047b Mon Sep 17 00:00:00 2001 From: kforbro Date: Sun, 10 Oct 2021 19:33:17 +0300 Subject: [PATCH 2/3] initializing the useProtocolLib boolean to false --- .../bukkit/listeners/AsyncTabCompleteBlockerListener.java | 4 ++++ .../eu/endermite/commandwhitelist/common/ConfigCache.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) 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 87fb772..2391e59 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 @@ -16,10 +16,14 @@ public class AsyncTabCompleteBlockerListener implements Listener { public void onCommandTabComplete(AsyncTabCompleteEvent event) { if (!(event.getSender() instanceof Player)) return; Player player = (Player) event.getSender(); + player.sendMessage("async"); if (player.hasPermission(CWPermission.BYPASS.permission())) return; + player.sendMessage("1"); String buffer = event.getBuffer(); if (!buffer.endsWith(" ") && buffer.split(" ").length == 1) event.setCancelled(true); + player.sendMessage("2"); if (event.getCompletions().isEmpty()) return; + player.sendMessage("3"); event.setCompletions(CommandUtil.filterSuggestions(buffer, event.getCompletions(), CommandWhitelistBukkit.getSuggestions(player))); } diff --git a/CommandWhitelistCommon/src/main/java/eu/endermite/commandwhitelist/common/ConfigCache.java b/CommandWhitelistCommon/src/main/java/eu/endermite/commandwhitelist/common/ConfigCache.java index 7bfc702..32d0042 100644 --- a/CommandWhitelistCommon/src/main/java/eu/endermite/commandwhitelist/common/ConfigCache.java +++ b/CommandWhitelistCommon/src/main/java/eu/endermite/commandwhitelist/common/ConfigCache.java @@ -16,7 +16,7 @@ public class ConfigCache { private final HashMap groupList = new LinkedHashMap<>(); public String prefix, command_denied, no_permission, no_such_subcommand, config_reloaded, added_to_whitelist, removed_from_whitelist, group_doesnt_exist, subcommand_denied; - public boolean useProtocolLib; + public boolean useProtocolLib = false; public ConfigCache(File configFile, boolean canDoProtocolLib, Object logger) { this.configFile = configFile; From f1d10243ceed0a3e20666e97bf8ee42327fe1b60 Mon Sep 17 00:00:00 2001 From: kforbro Date: Sun, 10 Oct 2021 19:36:00 +0300 Subject: [PATCH 3/3] removed debug --- .../bukkit/listeners/AsyncTabCompleteBlockerListener.java | 4 ---- 1 file changed, 4 deletions(-) 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 2391e59..87fb772 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 @@ -16,14 +16,10 @@ public class AsyncTabCompleteBlockerListener implements Listener { public void onCommandTabComplete(AsyncTabCompleteEvent event) { if (!(event.getSender() instanceof Player)) return; Player player = (Player) event.getSender(); - player.sendMessage("async"); if (player.hasPermission(CWPermission.BYPASS.permission())) return; - player.sendMessage("1"); String buffer = event.getBuffer(); if (!buffer.endsWith(" ") && buffer.split(" ").length == 1) event.setCancelled(true); - player.sendMessage("2"); if (event.getCompletions().isEmpty()) return; - player.sendMessage("3"); event.setCompletions(CommandUtil.filterSuggestions(buffer, event.getCompletions(), CommandWhitelistBukkit.getSuggestions(player))); }