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 | 52b1017bdaf31acc01dfcb3ff15b19c5e1f6ea62 (patch) | |
| tree | d6226d52cb6dd8bed70f9ac6dffce7d38a0f09d4 /EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java | |
| parent | b102c5f3d83d1959321197565817f2b49636f4da (diff) | |
| parent | e379ac5d777cff442dcf8eb64ac391565cf1ecb6 (diff) | |
| download | Essentials-52b1017bdaf31acc01dfcb3ff15b19c5e1f6ea62.tar Essentials-52b1017bdaf31acc01dfcb3ff15b19c5e1f6ea62.tar.gz Essentials-52b1017bdaf31acc01dfcb3ff15b19c5e1f6ea62.tar.lz Essentials-52b1017bdaf31acc01dfcb3ff15b19c5e1f6ea62.tar.xz Essentials-52b1017bdaf31acc01dfcb3ff15b19c5e1f6ea62.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()) |