From 0f23b7a460af276659d0122c2b7842194103cd47 Mon Sep 17 00:00:00 2001
From: Luck <git@lucko.me>
Date: Thu, 25 Jun 2020 10:24:33 +0100
Subject: [PATCH] Avoid calling #stream on the result of Bukkit
 getOnlinePlayers

---
 .../luckperms/bukkit/LPBukkitPlugin.java      |  5 +++-
 .../server/LuckPermsSubscriptionMap.java      | 24 +++++++++----------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitPlugin.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitPlugin.java
index a4008739a..d53f086bb 100644
--- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitPlugin.java
+++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitPlugin.java
@@ -75,6 +75,8 @@ import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.ServicePriority;
 
 import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
@@ -379,9 +381,10 @@ public class LPBukkitPlugin extends AbstractLuckPermsPlugin {
 
     @Override
     public Stream<Sender> getOnlineSenders() {
+        List<Player> players = new ArrayList<>(this.bootstrap.getServer().getOnlinePlayers());
         return Stream.concat(
                 Stream.of(getConsoleSender()),
-                this.bootstrap.getServer().getOnlinePlayers().stream().map(p -> getSenderFactory().wrap(p))
+                players.stream().map(p -> getSenderFactory().wrap(p))
         );
     }
 
diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/LuckPermsSubscriptionMap.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/LuckPermsSubscriptionMap.java
index 6207e9936..4f717f083 100644
--- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/LuckPermsSubscriptionMap.java
+++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/LuckPermsSubscriptionMap.java
@@ -25,9 +25,7 @@
 
 package me.lucko.luckperms.bukkit.inject.server;
 
-import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
 
 import me.lucko.luckperms.bukkit.LPBukkitPlugin;
 import me.lucko.luckperms.common.util.ImmutableCollectors;
@@ -40,12 +38,12 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 import java.util.WeakHashMap;
 import java.util.function.Function;
-import java.util.stream.Collectors;
 
 /**
  * A replacement map for the 'permSubs' instance in Bukkit's SimplePluginManager.
@@ -228,18 +226,20 @@ public final class LuckPermsSubscriptionMap extends HashMap<String, Map<Permissi
 
         @Override
         public @NonNull Set<Permissible> keySet() {
-            // gather players (LPPermissibles)
-            Set<Permissible> players = LuckPermsSubscriptionMap.this.plugin.getBootstrap().getServer().getOnlinePlayers().stream()
-                    .filter(player -> player.hasPermission(this.permission) || player.isPermissionSet(this.permission))
-                    .collect(Collectors.toSet());
-
-            ImmutableSet<Permissible> backing;
+            // start with the backing set
+            Set<Permissible> set;
             synchronized (this.backing) {
-                backing = ImmutableSet.copyOf(this.backing.keySet());
+                set = new HashSet<>(this.backing.keySet());
             }
 
-            // then combine the players with the backing map
-            return Sets.union(players, backing);
+            // add any online players who meet requirements
+            for (Player player : LuckPermsSubscriptionMap.this.plugin.getBootstrap().getServer().getOnlinePlayers()) {
+                if (player.hasPermission(this.permission) || player.isPermissionSet(this.permission)) {
+                    set.add(player);
+                }
+            }
+
+            return set;
         }
 
         @Override