diff options
author | KHobbits <rob@khobbits.co.uk> | 2011-12-08 04:44:34 +0000 |
---|---|---|
committer | KHobbits <rob@khobbits.co.uk> | 2011-12-08 04:44:34 +0000 |
commit | e484a2fa41fc420152ed972b152ca28f8bba851f (patch) | |
tree | d4423fd24211db04a1d638c26b855b6114fa4847 /EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java | |
parent | 1e07a1deb476014f00f3fe1dcb7ee12d4847ff1c (diff) | |
parent | a6ebf6d52d3495bb34bfb838e5fea46abfdf65d7 (diff) | |
download | Essentials-e484a2fa41fc420152ed972b152ca28f8bba851f.tar Essentials-e484a2fa41fc420152ed972b152ca28f8bba851f.tar.gz Essentials-e484a2fa41fc420152ed972b152ca28f8bba851f.tar.lz Essentials-e484a2fa41fc420152ed972b152ca28f8bba851f.tar.xz Essentials-e484a2fa41fc420152ed972b152ca28f8bba851f.zip |
Merge branch 'master' of github.com:essentials/Essentials
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()) |