diff options
author | ElgarL <ElgarL@palmergames.com> | 2012-01-25 23:44:14 +0000 |
---|---|---|
committer | ElgarL <ElgarL@palmergames.com> | 2012-01-25 23:44:14 +0000 |
commit | 6642d9996a48c28905774277501148f6ab304040 (patch) | |
tree | d099101bf2d349064a4df510ffc197d8036f714d /EssentialsGroupManager/src/org/anjocaido/groupmanager/data | |
parent | 29ca77791c8f7fd4e44b1fd3f0217f3666dbe63a (diff) | |
download | Essentials-6642d9996a48c28905774277501148f6ab304040.tar Essentials-6642d9996a48c28905774277501148f6ab304040.tar.gz Essentials-6642d9996a48c28905774277501148f6ab304040.tar.lz Essentials-6642d9996a48c28905774277501148f6ab304040.tar.xz Essentials-6642d9996a48c28905774277501148f6ab304040.zip |
Fixed an infinite loop error when using '/manudel' on a logged in
player. It caused setDefaultGroup to trigger a bukkit update when no GM
User existed yet.
Diffstat (limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/data')
-rw-r--r-- | EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java index 7a590c412..980b0846c 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java @@ -122,6 +122,15 @@ public class User extends DataUnit implements Cloneable { * the group to set */ public void setGroup(Group group) { + setGroup(group, true); + } + + /** + * @param group the group to set + * @param updatePerms if we are to trigger a superperms update. + * + */ + public void setGroup(Group group, Boolean updatePerms) { if (!this.getDataSource().groupExists(group.getName())) { getDataSource().addGroup(group); } @@ -129,7 +138,7 @@ public class User extends DataUnit implements Cloneable { String oldGroup = this.group; this.group = group.getName(); flagAsChanged(); - if (GroupManager.isLoaded()) { + if (GroupManager.isLoaded() && (updatePerms)) { if (!GroupManager.BukkitPermissions.isPlayer_join()) GroupManager.BukkitPermissions.updatePlayer(getBukkitPlayer()); |