From c0cd197bd0d3f336405f63ae7ceed6d3b6e84c29 Mon Sep 17 00:00:00 2001
From: Luck <git@lucko.me>
Date: Thu, 7 Jun 2018 17:01:25 +0100
Subject: [PATCH] Don't allow players to be added to SubscriptionValueMaps

---
 .../bukkit/model/server/LPSubscriptionMap.java | 18 +++++++++++++-----
 .../nukkit/model/server/LPSubscriptionMap.java |  9 +++++++++
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/model/server/LPSubscriptionMap.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/model/server/LPSubscriptionMap.java
index c280c11f..53794d7e 100644
--- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/model/server/LPSubscriptionMap.java
+++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/model/server/LPSubscriptionMap.java
@@ -161,6 +161,9 @@ public final class LPSubscriptionMap extends HashMap<String, Map<Permissible, Bo
         private LPSubscriptionValueMap(String permission, Map<Permissible, Boolean> backing) {
             this.permission = permission;
             this.backing = backing;
+
+            // remove all players from the map
+            this.backing.keySet().removeIf(p -> p instanceof Player);
         }
 
         public LPSubscriptionValueMap(String permission) {
@@ -197,6 +200,16 @@ public final class LPSubscriptionMap extends HashMap<String, Map<Permissible, Bo
             return null;
         }
 
+        @Override
+        public Boolean put(Permissible key, Boolean value) {
+            // don't allow players to be put into this map
+            if (key instanceof Player) {
+                return true;
+            }
+
+            return this.backing.put(key, value);
+        }
+
         @Override
         public boolean containsKey(Object key) {
             // delegate through the get method
@@ -241,11 +254,6 @@ public final class LPSubscriptionMap extends HashMap<String, Map<Permissible, Bo
 
         // just delegate to the backing map
 
-        @Override
-        public Boolean put(Permissible key, Boolean value) {
-            return this.backing.put(key, value);
-        }
-
         @Override
         public Boolean remove(Object key) {
             return this.backing.remove(key);
diff --git a/nukkit/src/main/java/me/lucko/luckperms/nukkit/model/server/LPSubscriptionMap.java b/nukkit/src/main/java/me/lucko/luckperms/nukkit/model/server/LPSubscriptionMap.java
index 27b5ed18..54890ae1 100644
--- a/nukkit/src/main/java/me/lucko/luckperms/nukkit/model/server/LPSubscriptionMap.java
+++ b/nukkit/src/main/java/me/lucko/luckperms/nukkit/model/server/LPSubscriptionMap.java
@@ -29,6 +29,7 @@ import com.google.common.collect.Sets;
 
 import me.lucko.luckperms.nukkit.LPNukkitPlugin;
 
+import cn.nukkit.Player;
 import cn.nukkit.permission.Permissible;
 import cn.nukkit.plugin.PluginManager;
 
@@ -161,6 +162,9 @@ public final class LPSubscriptionMap extends HashMap<String, Set<Permissible>> {
             if (content != null) {
                 this.backing.addAll(content);
             }
+
+            // remove all players from the map
+            this.backing.removeIf(p -> p instanceof Player);
         }
 
         private LPSubscriptionValueSet(String permission) {
@@ -223,6 +227,11 @@ public final class LPSubscriptionMap extends HashMap<String, Set<Permissible>> {
 
         @Override
         public boolean add(Permissible permissible) {
+            // don't allow players to be put into this map
+            if (permissible instanceof Player) {
+                return true;
+            }
+
             return this.backing.add(permissible);
         }