summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElgarL <ElgarL@palmergames.com>2012-04-05 15:02:08 +0100
committerElgarL <ElgarL@palmergames.com>2012-04-05 15:02:08 +0100
commitf7bc04bc347c088d35ee5a939c026f28b2ce0c19 (patch)
tree7321bfcd8831e3c603a9e241fc32d4fd81efcc28
parent381886245b7070e989acb12442a8aa6f6f1d5009 (diff)
downloadEssentials-f7bc04bc347c088d35ee5a939c026f28b2ce0c19.tar
Essentials-f7bc04bc347c088d35ee5a939c026f28b2ce0c19.tar.gz
Essentials-f7bc04bc347c088d35ee5a939c026f28b2ce0c19.tar.lz
Essentials-f7bc04bc347c088d35ee5a939c026f28b2ce0c19.tar.xz
Essentials-f7bc04bc347c088d35ee5a939c026f28b2ce0c19.zip
Fix an error I caused trying to modify an unmodifiable list when parsing
'*' permissions.
-rw-r--r--EssentialsGroupManager/src/Changelog.txt3
-rw-r--r--EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java4
2 files changed, 5 insertions, 2 deletions
diff --git a/EssentialsGroupManager/src/Changelog.txt b/EssentialsGroupManager/src/Changelog.txt
index a636ac6fe..c5fe5564d 100644
--- a/EssentialsGroupManager/src/Changelog.txt
+++ b/EssentialsGroupManager/src/Changelog.txt
@@ -162,4 +162,5 @@ v 1.9:
using GroupManager commands (they will still require each commands permission node to use them).
- Prevent Null entries in group inheritance from throwing errors.
v 2.0:
- - Fix GM reporting of permission inheritance to retain the correct order. Lower inheritance groups can no longer negate a higher groups permissions. \ No newline at end of file
+ - Fix GM reporting of permission inheritance to retain the correct order. Lower inheritance groups can no longer negate a higher groups permissions.
+ - Fix an error I caused trying to modify an unmodifiable list when parsing '*' permissions. \ No newline at end of file
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java
index 08240441d..b40694bb0 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java
@@ -155,8 +155,10 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
return playerPermArray;
}
- private Set<String> populatePerms (List<String> perms, boolean includeChildren) {
+ private Set<String> populatePerms (List<String> permsList, boolean includeChildren) {
+ // Create a new array so it's modifiable.
+ List<String> perms = new ArrayList<String>(permsList);
Set<String> permArray = new HashSet<String>();
Boolean allPerms = false;