From ae8500fad4c101dfeab8179a6938d418bd3410c4 Mon Sep 17 00:00:00 2001 From: ElgarL Date: Wed, 12 Oct 2011 00:16:53 +0100 Subject: Added a config setting - bukkit_perms_override: false Enable to allow default Bukkit based permissions to remain enabled, unless directly negated within GroupManager. --- .../permissions/BukkitPermissions.java | 29 +++++++++++++++++----- 1 file changed, 23 insertions(+), 6 deletions(-) (limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java') diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java index 19d90854b..6a5968c22 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java @@ -43,6 +43,7 @@ import org.bukkit.event.server.ServerListener; import org.bukkit.permissions.Permission; import org.bukkit.permissions.PermissionAttachment; import org.bukkit.permissions.PermissionAttachmentInfo; +import org.bukkit.permissions.PermissionDefault; import org.bukkit.plugin.Plugin; import org.bukkit.plugin.PluginManager; @@ -124,15 +125,31 @@ public class BukkitPermissions { User user = worldData.getUser(player.getName()); - // clear permissions - for (String permission : attachment.getPermissions().keySet()) { - attachment.unsetPermission(permission); - } + // clear permissions + for (String permission : attachment.getPermissions().keySet()) + attachment.unsetPermission(permission); - // find matching permissions + /* + * find matching permissions + * + * and base bukkit perms if we are set to allow bukkit permissions to override. + */ Boolean value; for (Permission permission : registeredPermissions) { - value = worldData.getPermissionsHandler().checkUserPermission(user, permission.getName()); + + value = worldData.getPermissionsHandler().checkUserPermission(user, permission.getName()); + + // Only check bukkit override IF we don't have the permission directly. + if (value = false) { + PermissionDefault permDefault = permission.getDefault(); + + if ((plugin.getGMConfig().isBukkitPermsOverride()) + && ((permDefault == PermissionDefault.TRUE) + || ((permDefault == PermissionDefault.NOT_OP) && !player.isOp()) + || ((permDefault == PermissionDefault.OP) && player.isOp()))) + value = true; + } + if (value == true) attachment.setPermission(permission, value); } -- cgit v1.2.3