diff options
author | md_5 <md_5@bigpond.com> | 2012-09-16 23:02:56 +1000 |
---|---|---|
committer | md_5 <md_5@bigpond.com> | 2012-09-16 23:02:56 +1000 |
commit | fd61cd17502eae4097df692063f9e76ea647226c (patch) | |
tree | 4c850d22c45f180d670bca0663c35dbf00bc2f2d /EssentialsGroupManager/src/org/anjocaido/groupmanager/data/GroupVariables.java | |
parent | e7ae8bcc4756fd8306814565ded2ec4a06897bf9 (diff) | |
parent | 75f7b06a23e8bed40d30068542b97959663c75e8 (diff) | |
download | Essentials-fd61cd17502eae4097df692063f9e76ea647226c.tar Essentials-fd61cd17502eae4097df692063f9e76ea647226c.tar.gz Essentials-fd61cd17502eae4097df692063f9e76ea647226c.tar.lz Essentials-fd61cd17502eae4097df692063f9e76ea647226c.tar.xz Essentials-fd61cd17502eae4097df692063f9e76ea647226c.zip |
Merge remote-tracking branch 'origin/groupmanager' into 2.9
Diffstat (limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/data/GroupVariables.java')
-rw-r--r-- | EssentialsGroupManager/src/org/anjocaido/groupmanager/data/GroupVariables.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/GroupVariables.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/GroupVariables.java index e08d1db7d..588d50116 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/GroupVariables.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/GroupVariables.java @@ -26,7 +26,8 @@ public class GroupVariables extends Variables implements Cloneable { public GroupVariables(Group owner, Map<String, Object> varList) { super(owner); - variables = varList; + variables.clear(); + variables.putAll(varList); if (variables.get("prefix") == null) { variables.put("prefix", ""); owner.flagAsChanged(); @@ -54,9 +55,11 @@ public class GroupVariables extends Variables implements Cloneable { protected GroupVariables clone(Group newOwner) { GroupVariables clone = new GroupVariables(newOwner); + synchronized(variables) { for (String key : variables.keySet()) { clone.variables.put(key, variables.get(key)); } + } newOwner.flagAsChanged(); return clone; } |