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

Small fix for #getAllWithPermission

Browse Source
This commit is contained in:
Luck 2016-10-03 16:45:52 +01:00
parent 58e223e74b
commit d626c08b4c
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sponge/src/main/java/me/lucko/luckperms/api/sponge/LuckPermsSubject.java
View File

@ -45,7 +45,7 @@ import static me.lucko.luckperms.utils.ArgumentChecker.unescapeCharacters;
@EqualsAndHashCode(of = {"holder"}) @EqualsAndHashCode(of = {"holder"})
public class LuckPermsSubject implements Subject { public class LuckPermsSubject implements Subject {
public static Subject wrapHolder(PermissionHolder holder, LuckPermsService service) { public static LuckPermsSubject wrapHolder(PermissionHolder holder, LuckPermsService service) {
return new LuckPermsSubject(holder, service); return new LuckPermsSubject(holder, service);
} }
@ -104,6 +104,10 @@ public class LuckPermsSubject implements Subject {
return transientData; return transientData;
} }
public boolean isPermissionSet(@NonNull Set<Context> contexts, @NonNull String node) {
return getPermissionValue(contexts, node) != Tristate.UNDEFINED;
}
@Override @Override
public boolean hasPermission(@NonNull Set<Context> contexts, @NonNull String node) { public boolean hasPermission(@NonNull Set<Context> contexts, @NonNull String node) {
return getPermissionValue(contexts, node).asBoolean(); return getPermissionValue(contexts, node).asBoolean();

2
sponge/src/main/java/me/lucko/luckperms/api/sponge/collections/GroupCollection.java
View File

@ -83,7 +83,7 @@ public class GroupCollection implements SubjectCollection {
public Map<Subject, Boolean> getAllWithPermission(@NonNull Set<Context> contexts, @NonNull String node) { public Map<Subject, Boolean> getAllWithPermission(@NonNull Set<Context> contexts, @NonNull String node) {
return manager.getAll().values().stream() return manager.getAll().values().stream()
.map(u -> LuckPermsSubject.wrapHolder(u, service)) .map(u -> LuckPermsSubject.wrapHolder(u, service))
.filter(sub -> sub.hasPermission(contexts, node)) .filter(sub -> sub.isPermissionSet(contexts, node))
.collect(Collectors.toMap(sub -> sub, sub -> sub.getPermissionValue(contexts, node).asBoolean())); .collect(Collectors.toMap(sub -> sub, sub -> sub.getPermissionValue(contexts, node).asBoolean()));
} }

2
sponge/src/main/java/me/lucko/luckperms/api/sponge/collections/UserCollection.java
View File

@ -129,7 +129,7 @@ public class UserCollection implements SubjectCollection {
@Override @Override
public Map<Subject, Boolean> getAllWithPermission(@NonNull Set<Context> contexts, @NonNull String node) { public Map<Subject, Boolean> getAllWithPermission(@NonNull Set<Context> contexts, @NonNull String node) {
return users.values().stream() return users.values().stream()
.filter(sub -> sub.hasPermission(contexts, node)) .filter(sub -> sub.isPermissionSet(contexts, node))
.collect(Collectors.toMap(sub -> sub, sub -> sub.getPermissionValue(contexts, node).asBoolean())); .collect(Collectors.toMap(sub -> sub, sub -> sub.getPermissionValue(contexts, node).asBoolean()));
} }