diff options
author | ElgarL <ElgarL@palmergames.com> | 2012-01-24 14:21:07 +0000 |
---|---|---|
committer | ElgarL <ElgarL@palmergames.com> | 2012-01-24 14:21:07 +0000 |
commit | 5f626f18662664fe226d04d91767cb913dab64f9 (patch) | |
tree | bb7b5dba9e4512e81a956b08c9f2129ce7d09a8b /EssentialsGroupManager/src/org/anjocaido/groupmanager/data | |
parent | 7d011cfe3adaacbc6412f6e1977f33661e50ddf5 (diff) | |
download | Essentials-5f626f18662664fe226d04d91767cb913dab64f9.tar Essentials-5f626f18662664fe226d04d91767cb913dab64f9.tar.gz Essentials-5f626f18662664fe226d04d91767cb913dab64f9.tar.lz Essentials-5f626f18662664fe226d04d91767cb913dab64f9.tar.xz Essentials-5f626f18662664fe226d04d91767cb913dab64f9.zip |
addSubGroup now returns a boolean for success/failure.
'/manuaddsub' now correctly reports if it was able to add the sub
group.
Diffstat (limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/data')
-rw-r--r-- | EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java index fd66bcfa2..6e9b7ad21 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java @@ -147,22 +147,26 @@ public class User extends DataUnit implements Cloneable { } } - public void addSubGroup(Group subGroup) { + public boolean addSubGroup(Group subGroup) { + // Don't allow adding a subgroup if it's already set as the primary. if (this.group.equalsIgnoreCase(subGroup.getName())) { - return; + return false; } if (!this.getDataSource().groupExists(subGroup.getName())) { getDataSource().addGroup(subGroup); + + flagAsChanged(); + if (GroupManager.isLoaded()) { + if (!GroupManager.BukkitPermissions.isPlayer_join()) + GroupManager.BukkitPermissions.updatePlayer(getBukkitPlayer()); + GroupManagerEventHandler.callEvent(this, Action.USER_SUBGROUP_CHANGED); + } + return true; } - subGroup = getDataSource().getGroup(subGroup.getName()); - removeSubGroup(subGroup); - subGroups.add(subGroup.getName()); - flagAsChanged(); - if (GroupManager.isLoaded()) { - if (!GroupManager.BukkitPermissions.isPlayer_join()) - GroupManager.BukkitPermissions.updatePlayer(getBukkitPlayer()); - GroupManagerEventHandler.callEvent(this, Action.USER_SUBGROUP_CHANGED); - } + //subGroup = getDataSource().getGroup(subGroup.getName()); + //removeSubGroup(subGroup); + //subGroups.add(subGroup.getName()); + return false; } public int subGroupsSize() { |