From 06fb4bbc1ae81f07c6f6456b687c3a87f0ae1448 Mon Sep 17 00:00:00 2001 From: yoyosource Date: Wed, 5 May 2021 09:35:51 +0200 Subject: [PATCH] Streamify SWCommand --- SpigotCore_Main/src/de/steamwar/command/SWCommand.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/SpigotCore_Main/src/de/steamwar/command/SWCommand.java b/SpigotCore_Main/src/de/steamwar/command/SWCommand.java index 9c66a2c..6ec6fb1 100644 --- a/SpigotCore_Main/src/de/steamwar/command/SWCommand.java +++ b/SpigotCore_Main/src/de/steamwar/command/SWCommand.java @@ -60,12 +60,10 @@ public abstract class SWCommand { @Override public List tabComplete(CommandSender sender, String alias, String[] args) throws IllegalArgumentException { - List strings = new ArrayList<>(); - for (SubCommand subCommand : commandList) { - List tabCompletes = subCommand.tabComplete(sender, args); - if (tabCompletes != null) strings.addAll(tabCompletes); - } - return strings.stream() + return commandList.stream() + .map(s -> s.tabComplete(sender, args)) + .filter(Objects::nonNull) + .flatMap(Collection::stream) .filter(s -> !s.isEmpty()) .filter(s -> !s.isBlank()) .filter(s -> s.toLowerCase().startsWith(args[args.length - 1].toLowerCase()))