diff --git a/pom.xml b/pom.xml index d6a756b..dcbb8cd 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ ru.simsonic rscPermissions - 0.9.16b + 0.9.17b jar rscPermissions @@ -78,7 +78,7 @@ ru.simsonic rscUtilityLibrary - 2.0.4 + 2.0.5 compile jar diff --git a/src/main/java/ru/simsonic/rscPermissions/Engine/InternalCache.java b/src/main/java/ru/simsonic/rscPermissions/Engine/InternalCache.java index fd5d38c..331e2d7 100644 --- a/src/main/java/ru/simsonic/rscPermissions/Engine/InternalCache.java +++ b/src/main/java/ru/simsonic/rscPermissions/Engine/InternalCache.java @@ -5,7 +5,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; -import java.util.LinkedHashSet; +import java.util.LinkedList; import java.util.List; import java.util.Map.Entry; import java.util.Set; @@ -176,7 +176,7 @@ public class InternalCache final ArrayList applicableInheritance = new ArrayList<>(); if(implicit_u != null && implicit_u.permissions != null) processPermissions(params, Arrays.asList(implicit_u.permissions)); - params.groupList = new LinkedHashSet<>(); + params.groupList = new LinkedList<>(); params.finalPerms = new HashMap<>(); params.instantiator = ""; params.depth = 0; diff --git a/src/main/java/ru/simsonic/rscPermissions/Engine/ResolutionParams.java b/src/main/java/ru/simsonic/rscPermissions/Engine/ResolutionParams.java index 0e16974..a71f2b9 100644 --- a/src/main/java/ru/simsonic/rscPermissions/Engine/ResolutionParams.java +++ b/src/main/java/ru/simsonic/rscPermissions/Engine/ResolutionParams.java @@ -1,7 +1,7 @@ package ru.simsonic.rscPermissions.Engine; +import java.util.List; import java.util.Map; -import java.util.Set; import ru.simsonic.rscPermissions.API.RowEntity; public class ResolutionParams @@ -14,5 +14,5 @@ public class ResolutionParams protected transient RowEntity parentEntity; protected transient String instantiator; protected transient Map finalPerms; - protected transient Set groupList; + protected transient List groupList; } diff --git a/src/main/java/ru/simsonic/rscPermissions/Engine/ResolutionResult.java b/src/main/java/ru/simsonic/rscPermissions/Engine/ResolutionResult.java index 71a0890..a2093df 100644 --- a/src/main/java/ru/simsonic/rscPermissions/Engine/ResolutionResult.java +++ b/src/main/java/ru/simsonic/rscPermissions/Engine/ResolutionResult.java @@ -2,8 +2,8 @@ package ru.simsonic.rscPermissions.Engine; import java.util.ArrayList; import java.util.Collections; +import java.util.List; import java.util.Map; -import java.util.Set; import ru.simsonic.rscPermissions.API.Settings; import ru.simsonic.rscUtilityLibrary.TextProcessing.GenericChatCodes; @@ -12,7 +12,7 @@ public class ResolutionResult public String prefix = ""; public String suffix = ""; public Map permissions; - protected Set groups; + protected List groups; public boolean hasPermission(String permission) { for(Map.Entry entry : permissions.entrySet()) @@ -32,9 +32,9 @@ public class ResolutionResult } return false; } - public Set getOrderedGroups() + public List getOrderedGroups() { - return Collections.unmodifiableSet(groups); + return Collections.unmodifiableList(groups); } public String[] getDeorderedGroups() {