worldofcraft/LuckPerms-DBA
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix vault primary group override feature

Browse Source
This commit is contained in:
Luck 2016-11-06 15:11:28 +00:00
parent 5ebbc178a5
commit 6cd8593fa5
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/VaultPermissionHook.java
View File

@ -376,7 +376,7 @@ public class VaultPermissionHook extends Permission {
} }
if (pgoCheckMemberOf) { if (pgoCheckMemberOf) {
if (!user.getLocalGroups(server, world).contains(group.toLowerCase())) { if (!user.getLocalGroups(server, world, isIncludeGlobal()).contains(group.toLowerCase())) {
continue; continue;
} }
} }

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

@ -890,6 +890,15 @@ public abstract class PermissionHolder {
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
public List<String> getLocalGroups(String server, String world, boolean includeGlobal) {
return getNodes().stream()
.filter(Node::isGroupNode)
.filter(n -> n.shouldApplyOnWorld(world, includeGlobal, true))
.filter(n -> n.shouldApplyOnServer(server, includeGlobal, true))
.map(Node::getGroupName)
.collect(Collectors.toList());
}
/** /**
* Get a {@link List} of the groups the holder inherits on a specific server * Get a {@link List} of the groups the holder inherits on a specific server
* @param server the server to check * @param server the server to check