Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-11-24 11:38:40 +01:00
Code Issues Projects Releases Wiki Activity

Fix CME

Browse Source
This commit is contained in:
Luck 2016-10-04 17:13:32 +01:00
parent de462d2385
commit bc65857831
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/src/main/java/me/lucko/luckperms/core/PermissionHolder.java
View File

@ -24,6 +24,7 @@ package me.lucko.luckperms.core;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.ImmutableSortedSet;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
@ -71,8 +72,8 @@ public abstract class PermissionHolder {
private final Set<Node> nodes = new HashSet<>();
private final Set<Node> transientNodes = new HashSet<>();
private Cache<SortedSet<LocalizedNode>> cache = new Cache<>();
private Cache<SortedSet<LocalizedNode>> mergedCache = new Cache<>();
private Cache<ImmutableSortedSet<LocalizedNode>> cache = new Cache<>();
private Cache<ImmutableSortedSet<LocalizedNode>> mergedCache = new Cache<>();
private Cache<ImmutableSet<Node>> enduringCache = new Cache<>();
private Cache<ImmutableSet<Node>> transientCache = new Cache<>();
@ -172,7 +173,7 @@ public abstract class PermissionHolder {
* @return the holders transient and permanent nodes
*/
public SortedSet<LocalizedNode> getPermissions(boolean mergeTemp) {
Supplier<SortedSet<LocalizedNode>> supplier = () -> {
Supplier<ImmutableSortedSet<LocalizedNode>> supplier = () -> {
TreeSet<LocalizedNode> combined = new TreeSet<>(PriorityComparator.reverse());
getNodes().stream()
@ -196,7 +197,7 @@ public abstract class PermissionHolder {
permissions.add(node);
}
return permissions;
return ImmutableSortedSet.copyOfSorted(permissions);
};
return mergeTemp ? mergedCache.get(supplier) : cache.get(supplier);