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

Account for inheritance and wildcards in SimpleSubject

Browse Source
This commit is contained in:
Luck 2016-10-07 18:11:59 +01:00
parent 924041bff4
commit 9d166041ab
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
sponge/src/main/java/me/lucko/luckperms/api/sponge/simple/SimpleSubject.java
View File

@ -42,7 +42,7 @@ public class SimpleSubject implements Subject {
private final PermissionService service; private final PermissionService service;
private final SubjectCollection containingCollection; private final SubjectCollection containingCollection;
private final SubjectData subjectData; private final MemorySubjectData subjectData;
public SimpleSubject(String identifier, PermissionService service, SubjectCollection containingCollection) { public SimpleSubject(String identifier, PermissionService service, SubjectCollection containingCollection) {
this.identifier = identifier; this.identifier = identifier;
@ -63,7 +63,7 @@ public class SimpleSubject implements Subject {
@Override @Override
public boolean hasPermission(@NonNull Set<Context> contexts, @NonNull String node) { public boolean hasPermission(@NonNull Set<Context> contexts, @NonNull String node) {
return subjectData.getPermissions(contexts).getOrDefault(node, false); return getPermissionValue(contexts, node).asBoolean();
} }
@Override @Override
@ -73,11 +73,17 @@ public class SimpleSubject implements Subject {
@Override @Override
public Tristate getPermissionValue(@NonNull Set<Context> contexts, @NonNull String node) { public Tristate getPermissionValue(@NonNull Set<Context> contexts, @NonNull String node) {
if (!subjectData.getPermissions(contexts).containsKey(node)) { Tristate res = subjectData.getNodeTree(contexts).get(node);
return Tristate.UNDEFINED; if (res == Tristate.UNDEFINED) {
for (Subject parent : getParents(contexts)) {
Tristate tempRes = parent.getPermissionValue(contexts, node);
if (tempRes != Tristate.UNDEFINED) {
res = tempRes;
break;
} }
}
return Tristate.fromBoolean(subjectData.getPermissions(contexts).get(node)); }
return res;
} }
@Override @Override
@ -101,13 +107,23 @@ public class SimpleSubject implements Subject {
} }
@Override @Override
public Optional<String> getOption(Set<Context> set, String s) { public Optional<String> getOption(Set<Context> set, String key) {
return Optional.ofNullable(subjectData.getOptions(set).get(s)); Optional<String> res = Optional.ofNullable(subjectData.getOptions(getActiveContexts()).get(key));
if (!res.isPresent()) {
for (Subject parent : getParents(getActiveContexts())) {
Optional<String> tempRes = parent.getOption(getActiveContexts(), key);
if (tempRes.isPresent()) {
res = tempRes;
break;
}
}
}
return res;
} }
@Override @Override
public Optional<String> getOption(String key) { public Optional<String> getOption(String key) {
return Optional.ofNullable(subjectData.getOptions(getActiveContexts()).get(key)); return getOption(getActiveContexts(), key);
} }
@Override @Override