From 4daef4aff23f90aad9fcc045bf98d98db9f28f66 Mon Sep 17 00:00:00 2001 From: zml Date: Wed, 25 Sep 2013 19:35:17 -0700 Subject: [PATCH] Check both superperms and PEX directly to support older versions of PEX with inGroup Older versions didn't set the group nodes correctly, so they were only accessible through getEffectivePermissions() --- src/main/java/com/sk89q/wepif/PermissionsExResolver.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/main/java/com/sk89q/wepif/PermissionsExResolver.java b/src/main/java/com/sk89q/wepif/PermissionsExResolver.java index 19a65323c..2329981ef 100644 --- a/src/main/java/com/sk89q/wepif/PermissionsExResolver.java +++ b/src/main/java/com/sk89q/wepif/PermissionsExResolver.java @@ -22,7 +22,6 @@ package com.sk89q.wepif; import com.sk89q.util.yaml.YAMLProcessor; import org.bukkit.OfflinePlayer; import org.bukkit.Server; -import org.bukkit.entity.Player; import org.bukkit.permissions.Permissible; import ru.tehkode.permissions.PermissionManager; import ru.tehkode.permissions.PermissionUser; @@ -67,11 +66,7 @@ public class PermissionsExResolver extends DinnerPermsResolver { } public boolean inGroup(OfflinePlayer player, String group) { - if (getPermissible(player) == null) { - return manager.getUser(player.getName()).inGroup(group); - } else { - return hasPermission(player, GROUP_PREFIX + group); - } + return super.inGroup(player, group) || manager.getUser(player.getName()).inGroup(group); } public String[] getGroups(OfflinePlayer player) {