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 4ffb085e7..48ec76bdf 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 @@ -25,7 +25,6 @@ package me.lucko.luckperms.common.model; -import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; @@ -272,14 +271,6 @@ public abstract class PermissionHolder { return nodes; } - public List getOwnInheritanceNodes(QueryOptions queryOptions) { - List nodes = new ArrayList<>(); - for (DataType dataType : queryOrder(queryOptions)) { - getData(dataType).copyInheritanceNodesTo(nodes, queryOptions); - } - return nodes; - } - public List getOwnNodes(NodeType type, QueryOptions queryOptions) { List nodes = new ArrayList<>(); for (DataType dataType : queryOrder(queryOptions)) { @@ -288,6 +279,14 @@ public abstract class PermissionHolder { return nodes; } + public List getOwnInheritanceNodes(QueryOptions queryOptions) { + List nodes = new ArrayList<>(); + for (DataType dataType : queryOrder(queryOptions)) { + getData(dataType).copyInheritanceNodesTo(nodes, queryOptions); + } + return nodes; + } + public List resolveInheritedNodes(QueryOptions queryOptions) { if (!queryOptions.flag(Flag.RESOLVE_INHERITANCE)) { return getOwnNodes(queryOptions); @@ -301,7 +300,6 @@ public abstract class PermissionHolder { } } return nodes; - } public SortedSet resolveInheritedNodesSorted(QueryOptions queryOptions) { @@ -365,7 +363,7 @@ public abstract class PermissionHolder { return processExportedPermissions(entries, convertToLowercase, resolveShorthand); } - private static ImmutableMap processExportedPermissions(List entries, boolean convertToLowercase, boolean resolveShorthand) { + private static Map processExportedPermissions(List entries, boolean convertToLowercase, boolean resolveShorthand) { Map map = new HashMap<>(entries.size()); for (Node node : entries) { if (convertToLowercase) { @@ -388,7 +386,7 @@ public abstract class PermissionHolder { } } - return ImmutableMap.copyOf(map); + return map; } public MetaAccumulator accumulateMeta(QueryOptions queryOptions) {