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

Sponge Subject lookup methods without a contexts param should default to current contexts, not global (#1279)

Browse Source
This commit is contained in:
Luck 2018-11-02 22:39:02 +00:00
parent 42c8cb1354
commit 8584a9b72c
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SubjectProxy.java
View File

@ -105,7 +105,7 @@ public final class SubjectProxy implements Subject, ProxiedSubject {
@Override
public boolean hasPermission(@NonNull String permission) {
return handle().thenApply(handle -> handle.getPermissionValue(ImmutableContextSet.empty(), permission).asBoolean()).join();
return handle().thenApply(handle -> handle.getPermissionValue(getActiveContextSet(), permission).asBoolean()).join();
}
@Override
@ -116,7 +116,7 @@ public final class SubjectProxy implements Subject, ProxiedSubject {
@Override
public boolean isChildOf(@NonNull Subject parent) {
return handle().thenApply(handle -> handle.isChildOf(
ImmutableContextSet.empty(),
getActiveContextSet(),
this.service.getReferenceFactory().obtain(parent)
)).join();
}
@ -131,7 +131,7 @@ public final class SubjectProxy implements Subject, ProxiedSubject {
@Override
public @NonNull List<Subject> getParents() {
return (List) handle().thenApply(handle -> handle.getParents(ImmutableContextSet.empty()).stream()
return (List) handle().thenApply(handle -> handle.getParents(getActiveContextSet()).stream()
.map(s -> new SubjectProxy(this.service, s))
.collect(ImmutableCollectors.toList())).join();
}
@ -150,7 +150,7 @@ public final class SubjectProxy implements Subject, ProxiedSubject {
@Override
public @NonNull Optional<String> getOption(@NonNull String key) {
return handle().thenApply(handle -> handle.getOption(ImmutableContextSet.empty(), key)).join();
return handle().thenApply(handle -> handle.getOption(getActiveContextSet(), key)).join();
}
@Override

8
sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SubjectProxy.java
View File

@ -110,7 +110,7 @@ public final class SubjectProxy implements Subject, ProxiedSubject {
@Override
public boolean hasPermission(@NonNull String permission) {
return handle().thenApply(handle -> handle.getPermissionValue(ImmutableContextSet.empty(), permission).asBoolean()).join();
return handle().thenApply(handle -> handle.getPermissionValue(getActiveContextSet(), permission).asBoolean()).join();
}
@Override
@ -120,7 +120,7 @@ public final class SubjectProxy implements Subject, ProxiedSubject {
@Override
public boolean isChildOf(@NonNull SubjectReference parent) {
return handle().thenApply(handle -> handle.isChildOf(ImmutableContextSet.empty(), this.service.getReferenceFactory().obtain(parent))).join();
return handle().thenApply(handle -> handle.isChildOf(getActiveContextSet(), this.service.getReferenceFactory().obtain(parent))).join();
}
@Override
@ -130,7 +130,7 @@ public final class SubjectProxy implements Subject, ProxiedSubject {
@Override
public @NonNull List<SubjectReference> getParents() {
return (List) handle().thenApply(handle -> handle.getParents(ImmutableContextSet.empty())).join();
return (List) handle().thenApply(handle -> handle.getParents(getActiveContextSet())).join();
}
@Override
@ -145,7 +145,7 @@ public final class SubjectProxy implements Subject, ProxiedSubject {
@Override
public @NonNull Optional<String> getOption(@NonNull String key) {
return handle().thenApply(handle -> handle.getOption(ImmutableContextSet.empty(), key)).join();
return handle().thenApply(handle -> handle.getOption(getActiveContextSet(), key)).join();
}
@Override