From e24a482debe2146ada13562a8d28100912e58e56 Mon Sep 17 00:00:00 2001
From: Luck <git@lucko.me>
Date: Sun, 21 Jan 2018 20:31:48 +0000
Subject: [PATCH] Don't call events for changes to transient nodes

---
 .../lucko/luckperms/common/model/NodeMap.java |  8 +++-
 .../common/model/PermissionHolder.java        | 48 ++++---------------
 2 files changed, 15 insertions(+), 41 deletions(-)

diff --git a/common/src/main/java/me/lucko/luckperms/common/model/NodeMap.java b/common/src/main/java/me/lucko/luckperms/common/model/NodeMap.java
index dc9336225..ea6a99e5e 100644
--- a/common/src/main/java/me/lucko/luckperms/common/model/NodeMap.java
+++ b/common/src/main/java/me/lucko/luckperms/common/model/NodeMap.java
@@ -52,6 +52,8 @@ import java.util.TreeSet;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Predicate;
 
+import javax.annotation.Nullable;
+
 /**
  * A map of nodes held by a {@link PermissionHolder}.
  *
@@ -251,7 +253,7 @@ public final class NodeMap {
         }
     }
 
-    boolean auditTemporaryNodes(Set<Node> removed) {
+    boolean auditTemporaryNodes(@Nullable Set<Node> removed) {
         boolean work = false;
 
         this.lock.lock();
@@ -260,7 +262,9 @@ public final class NodeMap {
             while (it.hasNext()) {
                 Node entry = it.next();
                 if (entry.hasExpired()) {
-                    removed.add(entry);
+                    if (removed != null) {
+                        removed.add(entry);
+                    }
                     work = true;
                     it.remove();
                 }
diff --git a/common/src/main/java/me/lucko/luckperms/common/model/PermissionHolder.java b/common/src/main/java/me/lucko/luckperms/common/model/PermissionHolder.java
index 5a1811956..6cfdef7e9 100644
--- a/common/src/main/java/me/lucko/luckperms/common/model/PermissionHolder.java
+++ b/common/src/main/java/me/lucko/luckperms/common/model/PermissionHolder.java
@@ -27,7 +27,6 @@ package me.lucko.luckperms.common.model;
 
 import com.google.common.collect.ImmutableCollection;
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSetMultimap;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Multimap;
@@ -64,7 +63,6 @@ import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -283,18 +281,6 @@ public abstract class PermissionHolder {
         invalidateCache();
     }
 
-    /**
-     * Merges enduring and transient permissions into one set
-     *
-     * @return a set containing the holders enduring and transient permissions
-     */
-    public Set<Node> getOwnNodesSet() {
-        Set<Node> ret = new LinkedHashSet<>();
-        this.transientNodes.copyTo(ret);
-        this.enduringNodes.copyTo(ret);
-        return ret;
-    }
-
     public List<Node> getOwnNodes() {
         List<Node> ret = new ArrayList<>();
         this.transientNodes.copyTo(ret);
@@ -694,25 +680,25 @@ public abstract class PermissionHolder {
     public boolean auditTemporaryPermissions() {
         Set<Node> removed = new HashSet<>();
 
-        ImmutableSet<Node> before = ImmutableSet.copyOf(getOwnNodesSet());
+        // audit temporary nodes first, but don't track ones which are removed
+        // we don't call events for transient nodes
+        this.transientNodes.auditTemporaryNodes(null);
 
-        if (this.enduringNodes.auditTemporaryNodes(removed) | this.transientNodes.auditTemporaryNodes(removed)) {
-            invalidateCache();
-        }
+        ImmutableCollection<Node> before = getEnduringNodes().values();
 
-        if (removed.isEmpty()) {
+        if (!this.enduringNodes.auditTemporaryNodes(removed)) {
             return false;
         }
 
-        ImmutableSet<Node> after = ImmutableSet.copyOf(getOwnNodesSet());
+        invalidateCache();
+        ImmutableCollection<Node> after = getEnduringNodes().values();
         for (Node r : removed) {
             this.plugin.getEventFactory().handleNodeRemove(r, this, before, after);
         }
-
         return true;
     }
 
-    public Optional<Node> getAlmostEquals(Node node, NodeMapType type) {
+    private Optional<Node> getAlmostEquals(Node node, NodeMapType type) {
         for (Node n : getData(type).immutable().values()) {
             if (n.almostEquals(node)) {
                 return Optional.of(n);
@@ -855,12 +841,8 @@ public abstract class PermissionHolder {
             return DataMutateResult.ALREADY_HAS;
         }
 
-        ImmutableCollection<Node> before = getTransientNodes().values();
         this.transientNodes.add(node);
         invalidateCache();
-        ImmutableCollection<Node> after = getTransientNodes().values();
-
-        this.plugin.getEventFactory().handleNodeAdd(node, this, before, after);
         return DataMutateResult.SUCCESS;
     }
 
@@ -893,12 +875,8 @@ public abstract class PermissionHolder {
             return DataMutateResult.LACKS;
         }
 
-        ImmutableCollection<Node> before = getTransientNodes().values();
         this.transientNodes.remove(node);
         invalidateCache();
-        ImmutableCollection<Node> after = getTransientNodes().values();
-
-        this.plugin.getEventFactory().handleNodeRemove(node, this, before, after);
         return DataMutateResult.SUCCESS;
     }
 
@@ -1024,16 +1002,8 @@ public abstract class PermissionHolder {
     }
 
     public boolean clearTransientNodes() {
-        ImmutableCollection<Node> before = getTransientNodes().values();
         this.transientNodes.clear();
         invalidateCache();
-        ImmutableCollection<Node> after = getTransientNodes().values();
-
-        if (before.size() == after.size()) {
-            return false;
-        }
-
-        this.plugin.getEventFactory().handleNodeClear(this, before, after);
         return true;
     }
 
@@ -1046,7 +1016,7 @@ public abstract class PermissionHolder {
 
         boolean seen = false;
         int best = 0;
-        for (Node n : getEnduringNodes().get(ImmutableContextSet.empty())) {
+        for (Node n : getOwnNodes(ImmutableContextSet.empty())) {
             Integer weight = NodeFactory.parseWeightNode(n.getPermission());
             if (weight == null) {
                 continue;