From 4308eda6fd4ce3d637ad29b50f53d870ec1facbc Mon Sep 17 00:00:00 2001
From: Luck <git@lucko.me>
Date: Sat, 3 Aug 2019 15:48:34 +0100
Subject: more cleanup work, fix build

---
 .../main/java/me/lucko/spark/bukkit/SparkBukkitPlugin.java | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'spark-bukkit/src/main/java/me')

diff --git a/spark-bukkit/src/main/java/me/lucko/spark/bukkit/SparkBukkitPlugin.java b/spark-bukkit/src/main/java/me/lucko/spark/bukkit/SparkBukkitPlugin.java
index 15882ce..ebcc3e8 100644
--- a/spark-bukkit/src/main/java/me/lucko/spark/bukkit/SparkBukkitPlugin.java
+++ b/spark-bukkit/src/main/java/me/lucko/spark/bukkit/SparkBukkitPlugin.java
@@ -31,10 +31,8 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import java.nio.file.Path;
-import java.util.LinkedList;
 import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public class SparkBukkitPlugin extends JavaPlugin implements SparkPlugin {
 
@@ -102,11 +100,11 @@ public class SparkBukkitPlugin extends JavaPlugin implements SparkPlugin {
     }
 
     @Override
-    public Set<BukkitCommandSender> getSendersWithPermission(String permission) {
-        List<CommandSender> senders = new LinkedList<>(getServer().getOnlinePlayers());
-        senders.removeIf(sender -> !sender.hasPermission(permission));
-        senders.add(getServer().getConsoleSender());
-        return senders.stream().map(BukkitCommandSender::new).collect(Collectors.toSet());
+    public Stream<BukkitCommandSender> getSendersWithPermission(String permission) {
+        return Stream.concat(
+                getServer().getOnlinePlayers().stream().filter(player -> player.hasPermission(permission)),
+                Stream.of(getServer().getConsoleSender())
+        ).map(BukkitCommandSender::new);
     }
 
     @Override
-- 
cgit