diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index d710e9d91c..4cab5f76bc 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -891,7 +891,7 @@ public class CreatureStat
 	 */
 	public void recalculateStats(boolean broadcast)
 	{
-		Set<Stat> changed = null;
+		_lock.writeLock().lock();
 		
 		// Copy old data before wiping it out
 		final Map<Stat, Double> adds;
@@ -907,7 +907,9 @@ public class CreatureStat
 			muls = null;
 		}
 		
-		_lock.writeLock().lock();
+		// Set of Stat that changed.
+		Set<Stat> changed = null;
+		
 		try
 		{
 			// Wipe all the data
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index d710e9d91c..4cab5f76bc 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -891,7 +891,7 @@ public class CreatureStat
 	 */
 	public void recalculateStats(boolean broadcast)
 	{
-		Set<Stat> changed = null;
+		_lock.writeLock().lock();
 		
 		// Copy old data before wiping it out
 		final Map<Stat, Double> adds;
@@ -907,7 +907,9 @@ public class CreatureStat
 			muls = null;
 		}
 		
-		_lock.writeLock().lock();
+		// Set of Stat that changed.
+		Set<Stat> changed = null;
+		
 		try
 		{
 			// Wipe all the data
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index d710e9d91c..4cab5f76bc 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -891,7 +891,7 @@ public class CreatureStat
 	 */
 	public void recalculateStats(boolean broadcast)
 	{
-		Set<Stat> changed = null;
+		_lock.writeLock().lock();
 		
 		// Copy old data before wiping it out
 		final Map<Stat, Double> adds;
@@ -907,7 +907,9 @@ public class CreatureStat
 			muls = null;
 		}
 		
-		_lock.writeLock().lock();
+		// Set of Stat that changed.
+		Set<Stat> changed = null;
+		
 		try
 		{
 			// Wipe all the data
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index d710e9d91c..4cab5f76bc 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -891,7 +891,7 @@ public class CreatureStat
 	 */
 	public void recalculateStats(boolean broadcast)
 	{
-		Set<Stat> changed = null;
+		_lock.writeLock().lock();
 		
 		// Copy old data before wiping it out
 		final Map<Stat, Double> adds;
@@ -907,7 +907,9 @@ public class CreatureStat
 			muls = null;
 		}
 		
-		_lock.writeLock().lock();
+		// Set of Stat that changed.
+		Set<Stat> changed = null;
+		
 		try
 		{
 			// Wipe all the data
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index d710e9d91c..4cab5f76bc 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -891,7 +891,7 @@ public class CreatureStat
 	 */
 	public void recalculateStats(boolean broadcast)
 	{
-		Set<Stat> changed = null;
+		_lock.writeLock().lock();
 		
 		// Copy old data before wiping it out
 		final Map<Stat, Double> adds;
@@ -907,7 +907,9 @@ public class CreatureStat
 			muls = null;
 		}
 		
-		_lock.writeLock().lock();
+		// Set of Stat that changed.
+		Set<Stat> changed = null;
+		
 		try
 		{
 			// Wipe all the data
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index d710e9d91c..4cab5f76bc 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -891,7 +891,7 @@ public class CreatureStat
 	 */
 	public void recalculateStats(boolean broadcast)
 	{
-		Set<Stat> changed = null;
+		_lock.writeLock().lock();
 		
 		// Copy old data before wiping it out
 		final Map<Stat, Double> adds;
@@ -907,7 +907,9 @@ public class CreatureStat
 			muls = null;
 		}
 		
-		_lock.writeLock().lock();
+		// Set of Stat that changed.
+		Set<Stat> changed = null;
+		
 		try
 		{
 			// Wipe all the data
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index d710e9d91c..4cab5f76bc 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -891,7 +891,7 @@ public class CreatureStat
 	 */
 	public void recalculateStats(boolean broadcast)
 	{
-		Set<Stat> changed = null;
+		_lock.writeLock().lock();
 		
 		// Copy old data before wiping it out
 		final Map<Stat, Double> adds;
@@ -907,7 +907,9 @@ public class CreatureStat
 			muls = null;
 		}
 		
-		_lock.writeLock().lock();
+		// Set of Stat that changed.
+		Set<Stat> changed = null;
+		
 		try
 		{
 			// Wipe all the data
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index d710e9d91c..4cab5f76bc 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -891,7 +891,7 @@ public class CreatureStat
 	 */
 	public void recalculateStats(boolean broadcast)
 	{
-		Set<Stat> changed = null;
+		_lock.writeLock().lock();
 		
 		// Copy old data before wiping it out
 		final Map<Stat, Double> adds;
@@ -907,7 +907,9 @@ public class CreatureStat
 			muls = null;
 		}
 		
-		_lock.writeLock().lock();
+		// Set of Stat that changed.
+		Set<Stat> changed = null;
+		
 		try
 		{
 			// Wipe all the data
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index c1e143dae4..ff207ab24c 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -881,7 +881,7 @@ public class CreatureStat
 	 */
 	public void recalculateStats(boolean broadcast)
 	{
-		Set<Stat> changed = null;
+		_lock.writeLock().lock();
 		
 		// Copy old data before wiping it out
 		final Map<Stat, Double> adds;
@@ -897,7 +897,9 @@ public class CreatureStat
 			muls = null;
 		}
 		
-		_lock.writeLock().lock();
+		// Set of Stat that changed.
+		Set<Stat> changed = null;
+		
 		try
 		{
 			// Wipe all the data
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index c1e143dae4..ff207ab24c 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -881,7 +881,7 @@ public class CreatureStat
 	 */
 	public void recalculateStats(boolean broadcast)
 	{
-		Set<Stat> changed = null;
+		_lock.writeLock().lock();
 		
 		// Copy old data before wiping it out
 		final Map<Stat, Double> adds;
@@ -897,7 +897,9 @@ public class CreatureStat
 			muls = null;
 		}
 		
-		_lock.writeLock().lock();
+		// Set of Stat that changed.
+		Set<Stat> changed = null;
+		
 		try
 		{
 			// Wipe all the data
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index c1e143dae4..ff207ab24c 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -881,7 +881,7 @@ public class CreatureStat
 	 */
 	public void recalculateStats(boolean broadcast)
 	{
-		Set<Stat> changed = null;
+		_lock.writeLock().lock();
 		
 		// Copy old data before wiping it out
 		final Map<Stat, Double> adds;
@@ -897,7 +897,9 @@ public class CreatureStat
 			muls = null;
 		}
 		
-		_lock.writeLock().lock();
+		// Set of Stat that changed.
+		Set<Stat> changed = null;
+		
 		try
 		{
 			// Wipe all the data
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index c1e143dae4..ff207ab24c 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -881,7 +881,7 @@ public class CreatureStat
 	 */
 	public void recalculateStats(boolean broadcast)
 	{
-		Set<Stat> changed = null;
+		_lock.writeLock().lock();
 		
 		// Copy old data before wiping it out
 		final Map<Stat, Double> adds;
@@ -897,7 +897,9 @@ public class CreatureStat
 			muls = null;
 		}
 		
-		_lock.writeLock().lock();
+		// Set of Stat that changed.
+		Set<Stat> changed = null;
+		
 		try
 		{
 			// Wipe all the data
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index c1e143dae4..ff207ab24c 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -881,7 +881,7 @@ public class CreatureStat
 	 */
 	public void recalculateStats(boolean broadcast)
 	{
-		Set<Stat> changed = null;
+		_lock.writeLock().lock();
 		
 		// Copy old data before wiping it out
 		final Map<Stat, Double> adds;
@@ -897,7 +897,9 @@ public class CreatureStat
 			muls = null;
 		}
 		
-		_lock.writeLock().lock();
+		// Set of Stat that changed.
+		Set<Stat> changed = null;
+		
 		try
 		{
 			// Wipe all the data
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index c1e143dae4..ff207ab24c 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -881,7 +881,7 @@ public class CreatureStat
 	 */
 	public void recalculateStats(boolean broadcast)
 	{
-		Set<Stat> changed = null;
+		_lock.writeLock().lock();
 		
 		// Copy old data before wiping it out
 		final Map<Stat, Double> adds;
@@ -897,7 +897,9 @@ public class CreatureStat
 			muls = null;
 		}
 		
-		_lock.writeLock().lock();
+		// Set of Stat that changed.
+		Set<Stat> changed = null;
+		
 		try
 		{
 			// Wipe all the data
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
index c1e143dae4..ff207ab24c 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
@@ -881,7 +881,7 @@ public class CreatureStat
 	 */
 	public void recalculateStats(boolean broadcast)
 	{
-		Set<Stat> changed = null;
+		_lock.writeLock().lock();
 		
 		// Copy old data before wiping it out
 		final Map<Stat, Double> adds;
@@ -897,7 +897,9 @@ public class CreatureStat
 			muls = null;
 		}
 		
-		_lock.writeLock().lock();
+		// Set of Stat that changed.
+		Set<Stat> changed = null;
+		
 		try
 		{
 			// Wipe all the data