diff --git a/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SubjectProxy.java b/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SubjectProxy.java index a2afd688..eab7d412 100644 --- a/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SubjectProxy.java +++ b/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SubjectProxy.java @@ -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 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 getOption(@NonNull String key) { - return handle().thenApply(handle -> handle.getOption(ImmutableContextSet.empty(), key)).join(); + return handle().thenApply(handle -> handle.getOption(getActiveContextSet(), key)).join(); } @Override diff --git a/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SubjectProxy.java b/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SubjectProxy.java index 576d3a7d..87988113 100644 --- a/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SubjectProxy.java +++ b/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SubjectProxy.java @@ -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 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 getOption(@NonNull String key) { - return handle().thenApply(handle -> handle.getOption(ImmutableContextSet.empty(), key)).join(); + return handle().thenApply(handle -> handle.getOption(getActiveContextSet(), key)).join(); } @Override