From 5fe73029658943b36af9d6ed912b47a39502440e Mon Sep 17 00:00:00 2001 From: Luck Date: Sat, 25 Jan 2020 16:43:31 +0000 Subject: [PATCH] Simplify vault hasPerm check for users --- .../luckperms/bukkit/vault/LuckPermsVaultPermission.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/LuckPermsVaultPermission.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/LuckPermsVaultPermission.java index 95b8a7d71..7c4938b6f 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/LuckPermsVaultPermission.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/LuckPermsVaultPermission.java @@ -51,7 +51,6 @@ import net.luckperms.api.model.data.DataType; import net.luckperms.api.node.Node; import net.luckperms.api.query.Flag; import net.luckperms.api.query.QueryOptions; -import net.luckperms.api.util.Tristate; import net.milkbowl.vault.permission.Permission; import org.bukkit.Bukkit; @@ -192,9 +191,7 @@ public class LuckPermsVaultPermission extends AbstractVaultPermission { PermissionHolder user = lookupUser(uuid); QueryOptions queryOptions = getQueryOptions(uuid, world); PermissionCache permissionData = user.getCachedData().getPermissionData(queryOptions); - - Tristate result = permissionData.checkPermission(permission, PermissionCheckEvent.Origin.THIRD_PARTY_API).result(); - return result != Tristate.UNDEFINED ? result.asBoolean() : org.bukkit.permissions.Permission.DEFAULT_PERMISSION.getValue(queryOptions.option(BukkitContextManager.OP_OPTION).orElse(false)); + return permissionData.checkPermission(permission, PermissionCheckEvent.Origin.THIRD_PARTY_API).result().asBoolean(); } @Override