diff options
author | snowleo <schneeleo@gmail.com> | 2011-11-29 21:38:00 +0100 |
---|---|---|
committer | snowleo <schneeleo@gmail.com> | 2011-11-29 21:38:00 +0100 |
commit | 42ec61a0dbc395fb9774823e91588a6878898967 (patch) | |
tree | 41dc01c593bcd6e443fba902c6c71b8bd9285473 | |
parent | 45c36c7099eb73d05b3a335a5ae36fa6ce759d3a (diff) | |
parent | de026afb92be234dc480630d523f8dfc7abd434a (diff) | |
download | Essentials-42ec61a0dbc395fb9774823e91588a6878898967.tar Essentials-42ec61a0dbc395fb9774823e91588a6878898967.tar.gz Essentials-42ec61a0dbc395fb9774823e91588a6878898967.tar.lz Essentials-42ec61a0dbc395fb9774823e91588a6878898967.tar.xz Essentials-42ec61a0dbc395fb9774823e91588a6878898967.zip |
Merge branch 'refs/heads/groupmanager'
3 files changed, 10 insertions, 9 deletions
diff --git a/EssentialsGroupManager/src/config.yml b/EssentialsGroupManager/src/config.yml index d9f469477..2fe5e509c 100644 --- a/EssentialsGroupManager/src/config.yml +++ b/EssentialsGroupManager/src/config.yml @@ -31,6 +31,7 @@ settings: # user/groups permissions as the parent. world: - world_nether + - world_the_end - world2 - world3 # world4: 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); } |