diff options
author | ElgarL <ElgarL@palmergames.com> | 2011-11-29 02:32:09 +0000 |
---|---|---|
committer | ElgarL <ElgarL@palmergames.com> | 2011-11-29 02:32:09 +0000 |
commit | 1838dbc931babfa474b3114ae425009bb4c2a494 (patch) | |
tree | db6ca6593b93fdc4b680b26493ce5ce32d44755b /EssentialsGroupManager/src/org | |
parent | 263a3fc80b31822b2a80a6cef12d77733db3d288 (diff) | |
download | Essentials-1838dbc931babfa474b3114ae425009bb4c2a494.tar Essentials-1838dbc931babfa474b3114ae425009bb4c2a494.tar.gz Essentials-1838dbc931babfa474b3114ae425009bb4c2a494.tar.lz Essentials-1838dbc931babfa474b3114ae425009bb4c2a494.tar.xz Essentials-1838dbc931babfa474b3114ae425009bb4c2a494.zip |
globalgroups prefix 'g:' is now not case sensitive.
Diffstat (limited to 'EssentialsGroupManager/src/org')
-rw-r--r-- | EssentialsGroupManager/src/org/anjocaido/groupmanager/GlobalGroups.java | 8 | ||||
-rw-r--r-- | EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GlobalGroups.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GlobalGroups.java index 861c5e3d4..d7971d424 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GlobalGroups.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GlobalGroups.java @@ -294,7 +294,7 @@ public class GlobalGroups { */
public boolean hasPermission(String groupName, String permissionNode) {
- if (!hasGroup(groupName.toLowerCase()))
+ if (!hasGroup(groupName))
return false;
return groups.get(groupName.toLowerCase()).hasSamePermissionNode(permissionNode);
@@ -315,7 +315,7 @@ public class GlobalGroups { result.askedPermission = permissionNode;
result.resultType = PermissionCheckResult.Type.NOTFOUND;
- if (!hasGroup(groupName.toLowerCase()))
+ if (!hasGroup(groupName))
return result;
Group tempGroup = groups.get(groupName.toLowerCase());
@@ -337,7 +337,7 @@ public class GlobalGroups { * @return List of all group names
*/
public List<String> getGroupsPermissions(String groupName) {
- if (!hasGroup(groupName.toLowerCase()))
+ if (!hasGroup(groupName))
return null;
return groups.get(groupName.toLowerCase()).getPermissionList();
@@ -374,7 +374,7 @@ public class GlobalGroups { * @return Group object
*/
public Group getGroup(String groupName) {
- if (!hasGroup(groupName.toLowerCase()))
+ if (!hasGroup(groupName))
return null;
return groups.get(groupName.toLowerCase());
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java index 59c5949f4..2b6a80da6 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java @@ -195,7 +195,7 @@ public class WorldDataHolder { * @return a group if it is found. null if not found. */ public Group getGroup(String groupName) { - if (groupName.startsWith("g:")) + if (groupName.toLowerCase().startsWith("g:")) return GroupManager.getGlobalGroups().getGroup(groupName); else return groups.get(groupName.toLowerCase()); @@ -208,7 +208,7 @@ public class WorldDataHolder { * @return true if exists. false if not. */ public boolean groupExists(String groupName) { - if (groupName.startsWith("g:")) + if (groupName.toLowerCase().startsWith("g:")) return GroupManager.getGlobalGroups().hasGroup(groupName); else return groups.containsKey(groupName.toLowerCase()); @@ -219,7 +219,7 @@ public class WorldDataHolder { * @param groupToAdd */ public void addGroup(Group groupToAdd) { - if (groupToAdd.getName().startsWith("g:")) { + if (groupToAdd.getName().toLowerCase().startsWith("g:")) { GroupManager.getGlobalGroups().addGroup(groupToAdd); return; } @@ -238,7 +238,7 @@ public class WorldDataHolder { * @return true if had something to remove. false the group was default or non-existant */ public boolean removeGroup(String groupName) { - if (groupName.startsWith("g:")) { + if (groupName.toLowerCase().startsWith("g:")) { return GroupManager.getGlobalGroups().removeGroup(groupName); } @@ -278,7 +278,7 @@ public class WorldDataHolder { * @return null if group already exists. or new Group */ public Group createGroup(String groupName) { - if (groupName.startsWith("g:")) { + if (groupName.toLowerCase().startsWith("g:")) { Group newGroup = new Group(groupName); return GroupManager.getGlobalGroups().newGroup(newGroup); } |