diff options
author | snowleo <schneeleo@gmail.com> | 2011-12-08 04:14:27 +0100 |
---|---|---|
committer | snowleo <schneeleo@gmail.com> | 2011-12-08 04:14:27 +0100 |
commit | a6ebf6d52d3495bb34bfb838e5fea46abfdf65d7 (patch) | |
tree | a4a59d2c1b6a8679338d825fc3038f40fef4a18d /EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java | |
parent | 7e29f6521307daa2fb56543f3a04062e67383e94 (diff) | |
parent | 697f3dbdb42bed6f1085249bbc7c87665ea646d9 (diff) | |
download | Essentials-a6ebf6d52d3495bb34bfb838e5fea46abfdf65d7.tar Essentials-a6ebf6d52d3495bb34bfb838e5fea46abfdf65d7.tar.gz Essentials-a6ebf6d52d3495bb34bfb838e5fea46abfdf65d7.tar.lz Essentials-a6ebf6d52d3495bb34bfb838e5fea46abfdf65d7.tar.xz Essentials-a6ebf6d52d3495bb34bfb838e5fea46abfdf65d7.zip |
Merge branch 'refs/heads/groupmanager'
Diffstat (limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java')
-rw-r--r-- | EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java index eea488ab2..10757475d 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java @@ -76,7 +76,7 @@ public class User extends DataUnit implements Cloneable { for (String perm : this.getPermissionList()) { clone.addPermission(perm); } - // clone.variables = this.variables.clone(); + clone.variables = this.variables.clone(this); clone.flagAsChanged(); return clone; } @@ -213,10 +213,11 @@ public class User extends DataUnit implements Cloneable { * @param varList */ public void setVariables(Map<String, Object> varList) { - UserVariables temp = new UserVariables(this, varList); + //UserVariables temp = new UserVariables(this, varList); variables.clearVars(); - for (String key : temp.getVarKeyList()) { - variables.addVar(key, temp.getVarObject(key)); + for (String key : varList.keySet()) { + System.out.print("Adding variable - " + key); + variables.addVar(key, varList.get(key)); } flagAsChanged(); if (GroupManager.isLoaded()) |