From 2dc211a91e905c1e03d6a1ccd3845529924411c3 Mon Sep 17 00:00:00 2001 From: Luck Date: Wed, 24 Apr 2019 18:40:27 +0100 Subject: [PATCH] Don't account for wildcard/default permissions when running require-sender-group-membership-to-modify checks (#1512) --- .../luckperms/common/command/access/ArgumentPermissions.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/me/lucko/luckperms/common/command/access/ArgumentPermissions.java b/common/src/main/java/me/lucko/luckperms/common/command/access/ArgumentPermissions.java index e59530964..afbf7103e 100644 --- a/common/src/main/java/me/lucko/luckperms/common/command/access/ArgumentPermissions.java +++ b/common/src/main/java/me/lucko/luckperms/common/command/access/ArgumentPermissions.java @@ -29,6 +29,8 @@ import me.lucko.luckperms.api.Contexts; import me.lucko.luckperms.api.Tristate; import me.lucko.luckperms.api.context.ContextSet; import me.lucko.luckperms.common.cacheddata.type.PermissionCache; +import me.lucko.luckperms.common.calculator.processor.MapProcessor; +import me.lucko.luckperms.common.calculator.result.TristateResult; import me.lucko.luckperms.common.config.ConfigKeys; import me.lucko.luckperms.common.model.Group; import me.lucko.luckperms.common.model.HolderType; @@ -302,7 +304,8 @@ public final class ArgumentPermissions { } PermissionCache permissionData = user.getCachedData().getPermissionData(Contexts.global().setContexts(contextSet)); - return !permissionData.getPermissionValue(NodeFactory.groupNode(targetGroupName), PermissionCheckEvent.Origin.INTERNAL).result().asBoolean(); + TristateResult result = permissionData.getPermissionValue(NodeFactory.groupNode(targetGroupName), PermissionCheckEvent.Origin.INTERNAL); + return result.result() != Tristate.TRUE || result.processorClass() != MapProcessor.class; } }