Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2025-02-17 21:11:51 +01:00
Code Issues Projects Releases Wiki Activity

apply group rewrites to vault - resolves #59

Browse Source
This commit is contained in:
Luck 2016-12-07 21:18:57 +00:00
parent 1c97cb3cec
commit 2fba9b83af
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
bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/VaultPermissionHook.java
View File

@ -248,8 +248,7 @@ public class VaultPermissionHook extends Permission {
.filter(n -> n.shouldApplyOnServer(server, isIncludeGlobal(), false)) .filter(n -> n.shouldApplyOnServer(server, isIncludeGlobal(), false))
.filter(n -> n.shouldApplyOnWorld(finalWorld, true, false)) .filter(n -> n.shouldApplyOnWorld(finalWorld, true, false))
.map(Node::getGroupName) .map(Node::getGroupName)
.filter(s -> s.equalsIgnoreCase(group)) .anyMatch(s -> s.equalsIgnoreCase(group));
.findAny().isPresent();
} }
@Override @Override
@ -329,7 +328,8 @@ public class VaultPermissionHook extends Permission {
} }
if (!pgo) { if (!pgo) {
return user.getPrimaryGroup(); String g = user.getPrimaryGroup();
return plugin.getConfiguration().getGroupNameRewrites().getOrDefault(g, g);
} }
if (pgoCheckInherited) { if (pgoCheckInherited) {
@ -394,7 +394,8 @@ public class VaultPermissionHook extends Permission {
} }
// Fallback // Fallback
return user.getPrimaryGroup(); String g = user.getPrimaryGroup();
return plugin.getConfiguration().getGroupNameRewrites().getOrDefault(g, g);
} }
@Override @Override