From 3d018599587b1f998f1a9e5b5852c42aec5b9c0a Mon Sep 17 00:00:00 2001 From: ThatDashiell Date: Sat, 15 Aug 2020 10:32:59 -0400 Subject: [PATCH 1/2] Add repo for waterfall --- pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pom.xml b/pom.xml index a82c44b..2c1cfd6 100644 --- a/pom.xml +++ b/pom.xml @@ -70,6 +70,10 @@ dmulloy2-repo https://repo.dmulloy2.net/nexus/repository/public/ + + papermc + https://papermc.io/repo/repository/maven-public/ + From b29fcd81eb3b264a01c77cfd379f7c7fc635325f Mon Sep 17 00:00:00 2001 From: ThatDashiell Date: Sat, 15 Aug 2020 10:43:44 -0400 Subject: [PATCH 2/2] fully embrace the stream api --- .../listeners/BungeeTabCompleteListener.java | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/src/main/java/eu/endermite/commandwhitelist/bungee/listeners/BungeeTabCompleteListener.java b/src/main/java/eu/endermite/commandwhitelist/bungee/listeners/BungeeTabCompleteListener.java index 7786e38..a8aadbb 100644 --- a/src/main/java/eu/endermite/commandwhitelist/bungee/listeners/BungeeTabCompleteListener.java +++ b/src/main/java/eu/endermite/commandwhitelist/bungee/listeners/BungeeTabCompleteListener.java @@ -6,10 +6,8 @@ import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.api.plugin.Command; import net.md_5.bungee.api.plugin.Listener; import net.md_5.bungee.event.EventHandler; -import java.util.ArrayList; + import java.util.HashMap; -import java.util.List; -import java.util.Map; public class BungeeTabCompleteListener implements Listener { @@ -23,21 +21,17 @@ public class BungeeTabCompleteListener implements Listener { return; } - List commandList = CommandsList.getCommands(player); - HashMap commandHashMap = new HashMap<>(); - for (String s : commandList) { - for (Map.Entry command : CommandWhitelistBungee.getPlugin().getProxy().getPluginManager().getCommands()) { - if (s.equalsIgnoreCase(command.getValue().getName())) { - commandHashMap.put(command.getKey(), command.getValue()); - } - } - } + CommandsList.getCommands(player).forEach(cmdName -> + CommandWhitelistBungee.getPlugin().getProxy().getPluginManager().getCommands() + .stream() + .filter(commandEntry -> cmdName.equalsIgnoreCase(commandEntry.getValue().getName())) + .forEach(commandEntry -> commandHashMap.put(commandEntry.getKey(), commandEntry.getValue()))); + event.getCommands().values().removeIf((cmd) -> !commandHashMap.containsValue(cmd)); } - } }