diff options
author | ElgarL <ElgarL@palmergames.com> | 2011-11-05 15:41:40 +0000 |
---|---|---|
committer | ElgarL <ElgarL@palmergames.com> | 2011-11-05 15:41:40 +0000 |
commit | cf9ef461822f9480d5d7c3de26489a061bc05b1e (patch) | |
tree | 4e6d0fa8bae4cde2f61915524e1e7b380ae22eb1 /EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Group.java | |
parent | 1c7e0e5b9fe3045ac5e14884f8fb0a1def5f0f99 (diff) | |
download | Essentials-cf9ef461822f9480d5d7c3de26489a061bc05b1e.tar Essentials-cf9ef461822f9480d5d7c3de26489a061bc05b1e.tar.gz Essentials-cf9ef461822f9480d5d7c3de26489a061bc05b1e.tar.lz Essentials-cf9ef461822f9480d5d7c3de26489a061bc05b1e.tar.xz Essentials-cf9ef461822f9480d5d7c3de26489a061bc05b1e.zip |
Fixed Group/User reloading
Fixed Group.clone(dataholder)
Diffstat (limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Group.java')
-rw-r--r-- | EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Group.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Group.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Group.java index e580918e7..c05065f5e 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Group.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Group.java @@ -76,8 +76,13 @@ public class Group extends DataUnit implements Cloneable { if (dataSource.groupExists(this.getName())) { return null; } - Group clone = getDataSource().createGroup(this.getName()); - clone.inherits = new ArrayList<String>(this.getInherits()); + + Group clone = dataSource.createGroup(this.getName()); + + // Don't add inheritance for GlobalGroups + if (getDataSource() != null) { + clone.inherits = new ArrayList<String>(this.getInherits()); + } for (String perm : this.getPermissionList()) { clone.addPermission(perm); } |