Thread safety for GM

1 files changed, 4 insertions, 1 deletions

diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/UserVariables.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/UserVariables.java
index f994595c1..05c3aecee 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/UserVariables.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/UserVariables.java
@@ -23,7 +23,8 @@ public class UserVariables extends Variables {
 	public UserVariables(User owner, Map<String, Object> varList) {
 
 		super(owner);
-		this.variables = varList;
+		this.variables.clear();
+		this.variables.putAll(varList);
 		this.owner = owner;
 	}
 
@@ -35,9 +36,11 @@ public class UserVariables extends Variables {
 	protected UserVariables clone(User newOwner) {
 
 		UserVariables clone = new UserVariables(newOwner);
+		synchronized(variables) {
 		for (String key : variables.keySet()) {
 			clone.variables.put(key, variables.get(key));
 		}
+		}
 		newOwner.flagAsChanged();
 		return clone;
 	}