summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElgarL <ElgarL@palmergames.com>2011-09-16 20:15:25 +0100
committerElgarL <ElgarL@palmergames.com>2011-09-16 20:15:25 +0100
commit73b5fe971f1dc77c008373652c49efa53b86990e (patch)
tree198159544679357a97c74e1f889adf1462881c88
parent63986265591eeddc72c4df3139afffc19eadbb9b (diff)
downloadEssentials-73b5fe971f1dc77c008373652c49efa53b86990e.tar
Essentials-73b5fe971f1dc77c008373652c49efa53b86990e.tar.gz
Essentials-73b5fe971f1dc77c008373652c49efa53b86990e.tar.lz
Essentials-73b5fe971f1dc77c008373652c49efa53b86990e.tar.xz
Essentials-73b5fe971f1dc77c008373652c49efa53b86990e.zip
Read from group not user for setting superperms
-rw-r--r--EssentialsGroupBridge/src/com/nijiko/permissions/PermissionHandler.classbin5289 -> 0 bytes
-rw-r--r--EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java4
2 files changed, 2 insertions, 2 deletions
diff --git a/EssentialsGroupBridge/src/com/nijiko/permissions/PermissionHandler.class b/EssentialsGroupBridge/src/com/nijiko/permissions/PermissionHandler.class
deleted file mode 100644
index d3022a484..000000000
--- a/EssentialsGroupBridge/src/com/nijiko/permissions/PermissionHandler.class
+++ /dev/null
Binary files differ
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
index 9e500b123..fe381c127 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
@@ -116,7 +116,7 @@ public class BukkitPermissions {
PermissionAttachment attachment = this.attachments.get(player);
User user = GroupManager.getWorldsHolder().getWorldData(world).getUser(player.getName());
- List<String> permissions = user.getPermissionList();
+ List<String> permissions = user.getGroup().getPermissionList();
// clear permissions
for (String permission : attachment.getPermissions().keySet()) {
@@ -136,7 +136,7 @@ public class BukkitPermissions {
permission = permission.substring(1); // cut off -
value = false;
}
-
+
if (!attachment.getPermissions().containsKey(permission)) {
attachment.setPermission(permission, value);
}