Upstream/AuthMeReloaded
1
0
Fork 0
mirror of https://github.com/AuthMe/AuthMeReloaded.git synced 2025-02-21 22:31:57 +01:00
Code Issues Projects Releases Wiki Activity

Use context aware groups

Browse Source
This commit is contained in:
David Maes 2020-08-24 22:35:35 +02:00
parent 7bd3455427
commit 5adc6ef753
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/fr/xephi/authme/permission/handlers/LuckPermsHandler.java
View File

@ -7,6 +7,8 @@ import fr.xephi.authme.permission.PermissionsSystemType;
import net.luckperms.api.LuckPerms; import net.luckperms.api.LuckPerms;
import net.luckperms.api.LuckPermsProvider; import net.luckperms.api.LuckPermsProvider;
import net.luckperms.api.cacheddata.CachedPermissionData; import net.luckperms.api.cacheddata.CachedPermissionData;
import net.luckperms.api.context.ContextSetFactory;
import net.luckperms.api.context.ImmutableContextSet;
import net.luckperms.api.model.data.DataMutateResult; import net.luckperms.api.model.data.DataMutateResult;
import net.luckperms.api.model.group.Group; import net.luckperms.api.model.group.Group;
import net.luckperms.api.model.user.User; import net.luckperms.api.model.user.User;
@ -15,10 +17,14 @@ import net.luckperms.api.node.types.InheritanceNode;
import net.luckperms.api.query.QueryMode; import net.luckperms.api.query.QueryMode;
import net.luckperms.api.query.QueryOptions; import net.luckperms.api.query.QueryOptions;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import org.bukkit.entity.Player;
import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.Set;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@ -168,10 +174,8 @@ public class LuckPermsHandler implements PermissionHandler {
return Collections.emptyList(); return Collections.emptyList();
} }
return user.getDistinctNodes().stream() Collection<Group> groups = user.getInheritedGroups(user.getQueryOptions());
.filter(node -> node instanceof InheritanceNode) return groups.stream()
.map(node -> (InheritanceNode) node)
.map(node -> luckPerms.getGroupManager().getGroup(node.getGroupName()))
.filter(Objects::nonNull) .filter(Objects::nonNull)
.sorted((o1, o2) -> { .sorted((o1, o2) -> {
if (o1.getName().equals(user.getPrimaryGroup()) || o2.getName().equals(user.getPrimaryGroup())) { if (o1.getName().equals(user.getPrimaryGroup()) || o2.getName().equals(user.getPrimaryGroup())) {