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 a1882e96ce..bd1735f879 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
@@ -987,33 +987,33 @@ public class CreatureStat
 			}
 			_attackSpeedMultiplier = Formulas.calcAtkSpdMultiplier(_creature);
 			_mAttackSpeedMultiplier = Formulas.calcMAtkSpdMultiplier(_creature);
+			
+			// Notify recalculation to child classes
+			onRecalculateStats(broadcast);
+			
+			if (broadcast && (adds != null) && (muls != null)) // adds and muls cannot be null when broadcast is true, but Eclipse throws warning bellow.
+			{
+				// Calculate the difference between old and new stats
+				final Set<Stat> changed = new HashSet<>();
+				for (Stat stat : Stat.values())
+				{
+					if ((_statsAdd.containsKey(stat) ? _statsAdd.get(stat) : stat.getResetAddValue()) != (adds.containsKey(stat) ? adds.get(stat) : stat.getResetAddValue()))
+					{
+						changed.add(stat);
+					}
+					else if ((_statsMul.containsKey(stat) ? _statsMul.get(stat) : stat.getResetMulValue()) != (muls.containsKey(stat) ? muls.get(stat) : stat.getResetMulValue()))
+					{
+						changed.add(stat);
+					}
+				}
+				
+				_creature.broadcastModifiedStats(changed);
+			}
 		}
 		finally
 		{
 			_lock.writeLock().unlock();
 		}
-		
-		// Notify recalculation to child classes
-		onRecalculateStats(broadcast);
-		
-		if (broadcast && (adds != null) && (muls != null)) // adds and muls cannot be null when broadcast is true, but Eclipse throws warning bellow.
-		{
-			// Calculate the difference between old and new stats
-			final Set<Stat> changed = new HashSet<>();
-			for (Stat stat : Stat.values())
-			{
-				if ((_statsAdd.containsKey(stat) ? _statsAdd.get(stat) : stat.getResetAddValue()) != (adds.containsKey(stat) ? adds.get(stat) : stat.getResetAddValue()))
-				{
-					changed.add(stat);
-				}
-				else if ((_statsMul.containsKey(stat) ? _statsMul.get(stat) : stat.getResetMulValue()) != (muls.containsKey(stat) ? muls.get(stat) : stat.getResetMulValue()))
-				{
-					changed.add(stat);
-				}
-			}
-			
-			_creature.broadcastModifiedStats(changed);
-		}
 	}
 	
 	protected void onRecalculateStats(boolean broadcast)
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 a1882e96ce..bd1735f879 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
@@ -987,33 +987,33 @@ public class CreatureStat
 			}
 			_attackSpeedMultiplier = Formulas.calcAtkSpdMultiplier(_creature);
 			_mAttackSpeedMultiplier = Formulas.calcMAtkSpdMultiplier(_creature);
+			
+			// Notify recalculation to child classes
+			onRecalculateStats(broadcast);
+			
+			if (broadcast && (adds != null) && (muls != null)) // adds and muls cannot be null when broadcast is true, but Eclipse throws warning bellow.
+			{
+				// Calculate the difference between old and new stats
+				final Set<Stat> changed = new HashSet<>();
+				for (Stat stat : Stat.values())
+				{
+					if ((_statsAdd.containsKey(stat) ? _statsAdd.get(stat) : stat.getResetAddValue()) != (adds.containsKey(stat) ? adds.get(stat) : stat.getResetAddValue()))
+					{
+						changed.add(stat);
+					}
+					else if ((_statsMul.containsKey(stat) ? _statsMul.get(stat) : stat.getResetMulValue()) != (muls.containsKey(stat) ? muls.get(stat) : stat.getResetMulValue()))
+					{
+						changed.add(stat);
+					}
+				}
+				
+				_creature.broadcastModifiedStats(changed);
+			}
 		}
 		finally
 		{
 			_lock.writeLock().unlock();
 		}
-		
-		// Notify recalculation to child classes
-		onRecalculateStats(broadcast);
-		
-		if (broadcast && (adds != null) && (muls != null)) // adds and muls cannot be null when broadcast is true, but Eclipse throws warning bellow.
-		{
-			// Calculate the difference between old and new stats
-			final Set<Stat> changed = new HashSet<>();
-			for (Stat stat : Stat.values())
-			{
-				if ((_statsAdd.containsKey(stat) ? _statsAdd.get(stat) : stat.getResetAddValue()) != (adds.containsKey(stat) ? adds.get(stat) : stat.getResetAddValue()))
-				{
-					changed.add(stat);
-				}
-				else if ((_statsMul.containsKey(stat) ? _statsMul.get(stat) : stat.getResetMulValue()) != (muls.containsKey(stat) ? muls.get(stat) : stat.getResetMulValue()))
-				{
-					changed.add(stat);
-				}
-			}
-			
-			_creature.broadcastModifiedStats(changed);
-		}
 	}
 	
 	protected void onRecalculateStats(boolean broadcast)
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 a1882e96ce..bd1735f879 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
@@ -987,33 +987,33 @@ public class CreatureStat
 			}
 			_attackSpeedMultiplier = Formulas.calcAtkSpdMultiplier(_creature);
 			_mAttackSpeedMultiplier = Formulas.calcMAtkSpdMultiplier(_creature);
+			
+			// Notify recalculation to child classes
+			onRecalculateStats(broadcast);
+			
+			if (broadcast && (adds != null) && (muls != null)) // adds and muls cannot be null when broadcast is true, but Eclipse throws warning bellow.
+			{
+				// Calculate the difference between old and new stats
+				final Set<Stat> changed = new HashSet<>();
+				for (Stat stat : Stat.values())
+				{
+					if ((_statsAdd.containsKey(stat) ? _statsAdd.get(stat) : stat.getResetAddValue()) != (adds.containsKey(stat) ? adds.get(stat) : stat.getResetAddValue()))
+					{
+						changed.add(stat);
+					}
+					else if ((_statsMul.containsKey(stat) ? _statsMul.get(stat) : stat.getResetMulValue()) != (muls.containsKey(stat) ? muls.get(stat) : stat.getResetMulValue()))
+					{
+						changed.add(stat);
+					}
+				}
+				
+				_creature.broadcastModifiedStats(changed);
+			}
 		}
 		finally
 		{
 			_lock.writeLock().unlock();
 		}
-		
-		// Notify recalculation to child classes
-		onRecalculateStats(broadcast);
-		
-		if (broadcast && (adds != null) && (muls != null)) // adds and muls cannot be null when broadcast is true, but Eclipse throws warning bellow.
-		{
-			// Calculate the difference between old and new stats
-			final Set<Stat> changed = new HashSet<>();
-			for (Stat stat : Stat.values())
-			{
-				if ((_statsAdd.containsKey(stat) ? _statsAdd.get(stat) : stat.getResetAddValue()) != (adds.containsKey(stat) ? adds.get(stat) : stat.getResetAddValue()))
-				{
-					changed.add(stat);
-				}
-				else if ((_statsMul.containsKey(stat) ? _statsMul.get(stat) : stat.getResetMulValue()) != (muls.containsKey(stat) ? muls.get(stat) : stat.getResetMulValue()))
-				{
-					changed.add(stat);
-				}
-			}
-			
-			_creature.broadcastModifiedStats(changed);
-		}
 	}
 	
 	protected void onRecalculateStats(boolean broadcast)
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 a1882e96ce..bd1735f879 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
@@ -987,33 +987,33 @@ public class CreatureStat
 			}
 			_attackSpeedMultiplier = Formulas.calcAtkSpdMultiplier(_creature);
 			_mAttackSpeedMultiplier = Formulas.calcMAtkSpdMultiplier(_creature);
+			
+			// Notify recalculation to child classes
+			onRecalculateStats(broadcast);
+			
+			if (broadcast && (adds != null) && (muls != null)) // adds and muls cannot be null when broadcast is true, but Eclipse throws warning bellow.
+			{
+				// Calculate the difference between old and new stats
+				final Set<Stat> changed = new HashSet<>();
+				for (Stat stat : Stat.values())
+				{
+					if ((_statsAdd.containsKey(stat) ? _statsAdd.get(stat) : stat.getResetAddValue()) != (adds.containsKey(stat) ? adds.get(stat) : stat.getResetAddValue()))
+					{
+						changed.add(stat);
+					}
+					else if ((_statsMul.containsKey(stat) ? _statsMul.get(stat) : stat.getResetMulValue()) != (muls.containsKey(stat) ? muls.get(stat) : stat.getResetMulValue()))
+					{
+						changed.add(stat);
+					}
+				}
+				
+				_creature.broadcastModifiedStats(changed);
+			}
 		}
 		finally
 		{
 			_lock.writeLock().unlock();
 		}
-		
-		// Notify recalculation to child classes
-		onRecalculateStats(broadcast);
-		
-		if (broadcast && (adds != null) && (muls != null)) // adds and muls cannot be null when broadcast is true, but Eclipse throws warning bellow.
-		{
-			// Calculate the difference between old and new stats
-			final Set<Stat> changed = new HashSet<>();
-			for (Stat stat : Stat.values())
-			{
-				if ((_statsAdd.containsKey(stat) ? _statsAdd.get(stat) : stat.getResetAddValue()) != (adds.containsKey(stat) ? adds.get(stat) : stat.getResetAddValue()))
-				{
-					changed.add(stat);
-				}
-				else if ((_statsMul.containsKey(stat) ? _statsMul.get(stat) : stat.getResetMulValue()) != (muls.containsKey(stat) ? muls.get(stat) : stat.getResetMulValue()))
-				{
-					changed.add(stat);
-				}
-			}
-			
-			_creature.broadcastModifiedStats(changed);
-		}
 	}
 	
 	protected void onRecalculateStats(boolean broadcast)
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 a1882e96ce..bd1735f879 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
@@ -987,33 +987,33 @@ public class CreatureStat
 			}
 			_attackSpeedMultiplier = Formulas.calcAtkSpdMultiplier(_creature);
 			_mAttackSpeedMultiplier = Formulas.calcMAtkSpdMultiplier(_creature);
+			
+			// Notify recalculation to child classes
+			onRecalculateStats(broadcast);
+			
+			if (broadcast && (adds != null) && (muls != null)) // adds and muls cannot be null when broadcast is true, but Eclipse throws warning bellow.
+			{
+				// Calculate the difference between old and new stats
+				final Set<Stat> changed = new HashSet<>();
+				for (Stat stat : Stat.values())
+				{
+					if ((_statsAdd.containsKey(stat) ? _statsAdd.get(stat) : stat.getResetAddValue()) != (adds.containsKey(stat) ? adds.get(stat) : stat.getResetAddValue()))
+					{
+						changed.add(stat);
+					}
+					else if ((_statsMul.containsKey(stat) ? _statsMul.get(stat) : stat.getResetMulValue()) != (muls.containsKey(stat) ? muls.get(stat) : stat.getResetMulValue()))
+					{
+						changed.add(stat);
+					}
+				}
+				
+				_creature.broadcastModifiedStats(changed);
+			}
 		}
 		finally
 		{
 			_lock.writeLock().unlock();
 		}
-		
-		// Notify recalculation to child classes
-		onRecalculateStats(broadcast);
-		
-		if (broadcast && (adds != null) && (muls != null)) // adds and muls cannot be null when broadcast is true, but Eclipse throws warning bellow.
-		{
-			// Calculate the difference between old and new stats
-			final Set<Stat> changed = new HashSet<>();
-			for (Stat stat : Stat.values())
-			{
-				if ((_statsAdd.containsKey(stat) ? _statsAdd.get(stat) : stat.getResetAddValue()) != (adds.containsKey(stat) ? adds.get(stat) : stat.getResetAddValue()))
-				{
-					changed.add(stat);
-				}
-				else if ((_statsMul.containsKey(stat) ? _statsMul.get(stat) : stat.getResetMulValue()) != (muls.containsKey(stat) ? muls.get(stat) : stat.getResetMulValue()))
-				{
-					changed.add(stat);
-				}
-			}
-			
-			_creature.broadcastModifiedStats(changed);
-		}
 	}
 	
 	protected void onRecalculateStats(boolean broadcast)
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 a1882e96ce..bd1735f879 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
@@ -987,33 +987,33 @@ public class CreatureStat
 			}
 			_attackSpeedMultiplier = Formulas.calcAtkSpdMultiplier(_creature);
 			_mAttackSpeedMultiplier = Formulas.calcMAtkSpdMultiplier(_creature);
+			
+			// Notify recalculation to child classes
+			onRecalculateStats(broadcast);
+			
+			if (broadcast && (adds != null) && (muls != null)) // adds and muls cannot be null when broadcast is true, but Eclipse throws warning bellow.
+			{
+				// Calculate the difference between old and new stats
+				final Set<Stat> changed = new HashSet<>();
+				for (Stat stat : Stat.values())
+				{
+					if ((_statsAdd.containsKey(stat) ? _statsAdd.get(stat) : stat.getResetAddValue()) != (adds.containsKey(stat) ? adds.get(stat) : stat.getResetAddValue()))
+					{
+						changed.add(stat);
+					}
+					else if ((_statsMul.containsKey(stat) ? _statsMul.get(stat) : stat.getResetMulValue()) != (muls.containsKey(stat) ? muls.get(stat) : stat.getResetMulValue()))
+					{
+						changed.add(stat);
+					}
+				}
+				
+				_creature.broadcastModifiedStats(changed);
+			}
 		}
 		finally
 		{
 			_lock.writeLock().unlock();
 		}
-		
-		// Notify recalculation to child classes
-		onRecalculateStats(broadcast);
-		
-		if (broadcast && (adds != null) && (muls != null)) // adds and muls cannot be null when broadcast is true, but Eclipse throws warning bellow.
-		{
-			// Calculate the difference between old and new stats
-			final Set<Stat> changed = new HashSet<>();
-			for (Stat stat : Stat.values())
-			{
-				if ((_statsAdd.containsKey(stat) ? _statsAdd.get(stat) : stat.getResetAddValue()) != (adds.containsKey(stat) ? adds.get(stat) : stat.getResetAddValue()))
-				{
-					changed.add(stat);
-				}
-				else if ((_statsMul.containsKey(stat) ? _statsMul.get(stat) : stat.getResetMulValue()) != (muls.containsKey(stat) ? muls.get(stat) : stat.getResetMulValue()))
-				{
-					changed.add(stat);
-				}
-			}
-			
-			_creature.broadcastModifiedStats(changed);
-		}
 	}
 	
 	protected void onRecalculateStats(boolean broadcast)
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 a1882e96ce..bd1735f879 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
@@ -987,33 +987,33 @@ public class CreatureStat
 			}
 			_attackSpeedMultiplier = Formulas.calcAtkSpdMultiplier(_creature);
 			_mAttackSpeedMultiplier = Formulas.calcMAtkSpdMultiplier(_creature);
+			
+			// Notify recalculation to child classes
+			onRecalculateStats(broadcast);
+			
+			if (broadcast && (adds != null) && (muls != null)) // adds and muls cannot be null when broadcast is true, but Eclipse throws warning bellow.
+			{
+				// Calculate the difference between old and new stats
+				final Set<Stat> changed = new HashSet<>();
+				for (Stat stat : Stat.values())
+				{
+					if ((_statsAdd.containsKey(stat) ? _statsAdd.get(stat) : stat.getResetAddValue()) != (adds.containsKey(stat) ? adds.get(stat) : stat.getResetAddValue()))
+					{
+						changed.add(stat);
+					}
+					else if ((_statsMul.containsKey(stat) ? _statsMul.get(stat) : stat.getResetMulValue()) != (muls.containsKey(stat) ? muls.get(stat) : stat.getResetMulValue()))
+					{
+						changed.add(stat);
+					}
+				}
+				
+				_creature.broadcastModifiedStats(changed);
+			}
 		}
 		finally
 		{
 			_lock.writeLock().unlock();
 		}
-		
-		// Notify recalculation to child classes
-		onRecalculateStats(broadcast);
-		
-		if (broadcast && (adds != null) && (muls != null)) // adds and muls cannot be null when broadcast is true, but Eclipse throws warning bellow.
-		{
-			// Calculate the difference between old and new stats
-			final Set<Stat> changed = new HashSet<>();
-			for (Stat stat : Stat.values())
-			{
-				if ((_statsAdd.containsKey(stat) ? _statsAdd.get(stat) : stat.getResetAddValue()) != (adds.containsKey(stat) ? adds.get(stat) : stat.getResetAddValue()))
-				{
-					changed.add(stat);
-				}
-				else if ((_statsMul.containsKey(stat) ? _statsMul.get(stat) : stat.getResetMulValue()) != (muls.containsKey(stat) ? muls.get(stat) : stat.getResetMulValue()))
-				{
-					changed.add(stat);
-				}
-			}
-			
-			_creature.broadcastModifiedStats(changed);
-		}
 	}
 	
 	protected void onRecalculateStats(boolean broadcast)
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 a1882e96ce..bd1735f879 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
@@ -987,33 +987,33 @@ public class CreatureStat
 			}
 			_attackSpeedMultiplier = Formulas.calcAtkSpdMultiplier(_creature);
 			_mAttackSpeedMultiplier = Formulas.calcMAtkSpdMultiplier(_creature);
+			
+			// Notify recalculation to child classes
+			onRecalculateStats(broadcast);
+			
+			if (broadcast && (adds != null) && (muls != null)) // adds and muls cannot be null when broadcast is true, but Eclipse throws warning bellow.
+			{
+				// Calculate the difference between old and new stats
+				final Set<Stat> changed = new HashSet<>();
+				for (Stat stat : Stat.values())
+				{
+					if ((_statsAdd.containsKey(stat) ? _statsAdd.get(stat) : stat.getResetAddValue()) != (adds.containsKey(stat) ? adds.get(stat) : stat.getResetAddValue()))
+					{
+						changed.add(stat);
+					}
+					else if ((_statsMul.containsKey(stat) ? _statsMul.get(stat) : stat.getResetMulValue()) != (muls.containsKey(stat) ? muls.get(stat) : stat.getResetMulValue()))
+					{
+						changed.add(stat);
+					}
+				}
+				
+				_creature.broadcastModifiedStats(changed);
+			}
 		}
 		finally
 		{
 			_lock.writeLock().unlock();
 		}
-		
-		// Notify recalculation to child classes
-		onRecalculateStats(broadcast);
-		
-		if (broadcast && (adds != null) && (muls != null)) // adds and muls cannot be null when broadcast is true, but Eclipse throws warning bellow.
-		{
-			// Calculate the difference between old and new stats
-			final Set<Stat> changed = new HashSet<>();
-			for (Stat stat : Stat.values())
-			{
-				if ((_statsAdd.containsKey(stat) ? _statsAdd.get(stat) : stat.getResetAddValue()) != (adds.containsKey(stat) ? adds.get(stat) : stat.getResetAddValue()))
-				{
-					changed.add(stat);
-				}
-				else if ((_statsMul.containsKey(stat) ? _statsMul.get(stat) : stat.getResetMulValue()) != (muls.containsKey(stat) ? muls.get(stat) : stat.getResetMulValue()))
-				{
-					changed.add(stat);
-				}
-			}
-			
-			_creature.broadcastModifiedStats(changed);
-		}
 	}
 	
 	protected void onRecalculateStats(boolean broadcast)
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 ea17169ba6..bffe6681a9 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
@@ -977,33 +977,33 @@ public class CreatureStat
 			}
 			_attackSpeedMultiplier = Formulas.calcAtkSpdMultiplier(_creature);
 			_mAttackSpeedMultiplier = Formulas.calcMAtkSpdMultiplier(_creature);
+			
+			// Notify recalculation to child classes
+			onRecalculateStats(broadcast);
+			
+			if (broadcast && (adds != null) && (muls != null)) // adds and muls cannot be null when broadcast is true, but Eclipse throws warning bellow.
+			{
+				// Calculate the difference between old and new stats
+				final Set<Stat> changed = new HashSet<>();
+				for (Stat stat : Stat.values())
+				{
+					if ((_statsAdd.containsKey(stat) ? _statsAdd.get(stat) : stat.getResetAddValue()) != (adds.containsKey(stat) ? adds.get(stat) : stat.getResetAddValue()))
+					{
+						changed.add(stat);
+					}
+					else if ((_statsMul.containsKey(stat) ? _statsMul.get(stat) : stat.getResetMulValue()) != (muls.containsKey(stat) ? muls.get(stat) : stat.getResetMulValue()))
+					{
+						changed.add(stat);
+					}
+				}
+				
+				_creature.broadcastModifiedStats(changed);
+			}
 		}
 		finally
 		{
 			_lock.writeLock().unlock();
 		}
-		
-		// Notify recalculation to child classes
-		onRecalculateStats(broadcast);
-		
-		if (broadcast && (adds != null) && (muls != null)) // adds and muls cannot be null when broadcast is true, but Eclipse throws warning bellow.
-		{
-			// Calculate the difference between old and new stats
-			final Set<Stat> changed = new HashSet<>();
-			for (Stat stat : Stat.values())
-			{
-				if ((_statsAdd.containsKey(stat) ? _statsAdd.get(stat) : stat.getResetAddValue()) != (adds.containsKey(stat) ? adds.get(stat) : stat.getResetAddValue()))
-				{
-					changed.add(stat);
-				}
-				else if ((_statsMul.containsKey(stat) ? _statsMul.get(stat) : stat.getResetMulValue()) != (muls.containsKey(stat) ? muls.get(stat) : stat.getResetMulValue()))
-				{
-					changed.add(stat);
-				}
-			}
-			
-			_creature.broadcastModifiedStats(changed);
-		}
 	}
 	
 	protected void onRecalculateStats(boolean broadcast)
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 ea17169ba6..bffe6681a9 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
@@ -977,33 +977,33 @@ public class CreatureStat
 			}
 			_attackSpeedMultiplier = Formulas.calcAtkSpdMultiplier(_creature);
 			_mAttackSpeedMultiplier = Formulas.calcMAtkSpdMultiplier(_creature);
+			
+			// Notify recalculation to child classes
+			onRecalculateStats(broadcast);
+			
+			if (broadcast && (adds != null) && (muls != null)) // adds and muls cannot be null when broadcast is true, but Eclipse throws warning bellow.
+			{
+				// Calculate the difference between old and new stats
+				final Set<Stat> changed = new HashSet<>();
+				for (Stat stat : Stat.values())
+				{
+					if ((_statsAdd.containsKey(stat) ? _statsAdd.get(stat) : stat.getResetAddValue()) != (adds.containsKey(stat) ? adds.get(stat) : stat.getResetAddValue()))
+					{
+						changed.add(stat);
+					}
+					else if ((_statsMul.containsKey(stat) ? _statsMul.get(stat) : stat.getResetMulValue()) != (muls.containsKey(stat) ? muls.get(stat) : stat.getResetMulValue()))
+					{
+						changed.add(stat);
+					}
+				}
+				
+				_creature.broadcastModifiedStats(changed);
+			}
 		}
 		finally
 		{
 			_lock.writeLock().unlock();
 		}
-		
-		// Notify recalculation to child classes
-		onRecalculateStats(broadcast);
-		
-		if (broadcast && (adds != null) && (muls != null)) // adds and muls cannot be null when broadcast is true, but Eclipse throws warning bellow.
-		{
-			// Calculate the difference between old and new stats
-			final Set<Stat> changed = new HashSet<>();
-			for (Stat stat : Stat.values())
-			{
-				if ((_statsAdd.containsKey(stat) ? _statsAdd.get(stat) : stat.getResetAddValue()) != (adds.containsKey(stat) ? adds.get(stat) : stat.getResetAddValue()))
-				{
-					changed.add(stat);
-				}
-				else if ((_statsMul.containsKey(stat) ? _statsMul.get(stat) : stat.getResetMulValue()) != (muls.containsKey(stat) ? muls.get(stat) : stat.getResetMulValue()))
-				{
-					changed.add(stat);
-				}
-			}
-			
-			_creature.broadcastModifiedStats(changed);
-		}
 	}
 	
 	protected void onRecalculateStats(boolean broadcast)
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 ea17169ba6..bffe6681a9 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
@@ -977,33 +977,33 @@ public class CreatureStat
 			}
 			_attackSpeedMultiplier = Formulas.calcAtkSpdMultiplier(_creature);
 			_mAttackSpeedMultiplier = Formulas.calcMAtkSpdMultiplier(_creature);
+			
+			// Notify recalculation to child classes
+			onRecalculateStats(broadcast);
+			
+			if (broadcast && (adds != null) && (muls != null)) // adds and muls cannot be null when broadcast is true, but Eclipse throws warning bellow.
+			{
+				// Calculate the difference between old and new stats
+				final Set<Stat> changed = new HashSet<>();
+				for (Stat stat : Stat.values())
+				{
+					if ((_statsAdd.containsKey(stat) ? _statsAdd.get(stat) : stat.getResetAddValue()) != (adds.containsKey(stat) ? adds.get(stat) : stat.getResetAddValue()))
+					{
+						changed.add(stat);
+					}
+					else if ((_statsMul.containsKey(stat) ? _statsMul.get(stat) : stat.getResetMulValue()) != (muls.containsKey(stat) ? muls.get(stat) : stat.getResetMulValue()))
+					{
+						changed.add(stat);
+					}
+				}
+				
+				_creature.broadcastModifiedStats(changed);
+			}
 		}
 		finally
 		{
 			_lock.writeLock().unlock();
 		}
-		
-		// Notify recalculation to child classes
-		onRecalculateStats(broadcast);
-		
-		if (broadcast && (adds != null) && (muls != null)) // adds and muls cannot be null when broadcast is true, but Eclipse throws warning bellow.
-		{
-			// Calculate the difference between old and new stats
-			final Set<Stat> changed = new HashSet<>();
-			for (Stat stat : Stat.values())
-			{
-				if ((_statsAdd.containsKey(stat) ? _statsAdd.get(stat) : stat.getResetAddValue()) != (adds.containsKey(stat) ? adds.get(stat) : stat.getResetAddValue()))
-				{
-					changed.add(stat);
-				}
-				else if ((_statsMul.containsKey(stat) ? _statsMul.get(stat) : stat.getResetMulValue()) != (muls.containsKey(stat) ? muls.get(stat) : stat.getResetMulValue()))
-				{
-					changed.add(stat);
-				}
-			}
-			
-			_creature.broadcastModifiedStats(changed);
-		}
 	}
 	
 	protected void onRecalculateStats(boolean broadcast)
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 ea17169ba6..bffe6681a9 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
@@ -977,33 +977,33 @@ public class CreatureStat
 			}
 			_attackSpeedMultiplier = Formulas.calcAtkSpdMultiplier(_creature);
 			_mAttackSpeedMultiplier = Formulas.calcMAtkSpdMultiplier(_creature);
+			
+			// Notify recalculation to child classes
+			onRecalculateStats(broadcast);
+			
+			if (broadcast && (adds != null) && (muls != null)) // adds and muls cannot be null when broadcast is true, but Eclipse throws warning bellow.
+			{
+				// Calculate the difference between old and new stats
+				final Set<Stat> changed = new HashSet<>();
+				for (Stat stat : Stat.values())
+				{
+					if ((_statsAdd.containsKey(stat) ? _statsAdd.get(stat) : stat.getResetAddValue()) != (adds.containsKey(stat) ? adds.get(stat) : stat.getResetAddValue()))
+					{
+						changed.add(stat);
+					}
+					else if ((_statsMul.containsKey(stat) ? _statsMul.get(stat) : stat.getResetMulValue()) != (muls.containsKey(stat) ? muls.get(stat) : stat.getResetMulValue()))
+					{
+						changed.add(stat);
+					}
+				}
+				
+				_creature.broadcastModifiedStats(changed);
+			}
 		}
 		finally
 		{
 			_lock.writeLock().unlock();
 		}
-		
-		// Notify recalculation to child classes
-		onRecalculateStats(broadcast);
-		
-		if (broadcast && (adds != null) && (muls != null)) // adds and muls cannot be null when broadcast is true, but Eclipse throws warning bellow.
-		{
-			// Calculate the difference between old and new stats
-			final Set<Stat> changed = new HashSet<>();
-			for (Stat stat : Stat.values())
-			{
-				if ((_statsAdd.containsKey(stat) ? _statsAdd.get(stat) : stat.getResetAddValue()) != (adds.containsKey(stat) ? adds.get(stat) : stat.getResetAddValue()))
-				{
-					changed.add(stat);
-				}
-				else if ((_statsMul.containsKey(stat) ? _statsMul.get(stat) : stat.getResetMulValue()) != (muls.containsKey(stat) ? muls.get(stat) : stat.getResetMulValue()))
-				{
-					changed.add(stat);
-				}
-			}
-			
-			_creature.broadcastModifiedStats(changed);
-		}
 	}
 	
 	protected void onRecalculateStats(boolean broadcast)
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 ea17169ba6..bffe6681a9 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
@@ -977,33 +977,33 @@ public class CreatureStat
 			}
 			_attackSpeedMultiplier = Formulas.calcAtkSpdMultiplier(_creature);
 			_mAttackSpeedMultiplier = Formulas.calcMAtkSpdMultiplier(_creature);
+			
+			// Notify recalculation to child classes
+			onRecalculateStats(broadcast);
+			
+			if (broadcast && (adds != null) && (muls != null)) // adds and muls cannot be null when broadcast is true, but Eclipse throws warning bellow.
+			{
+				// Calculate the difference between old and new stats
+				final Set<Stat> changed = new HashSet<>();
+				for (Stat stat : Stat.values())
+				{
+					if ((_statsAdd.containsKey(stat) ? _statsAdd.get(stat) : stat.getResetAddValue()) != (adds.containsKey(stat) ? adds.get(stat) : stat.getResetAddValue()))
+					{
+						changed.add(stat);
+					}
+					else if ((_statsMul.containsKey(stat) ? _statsMul.get(stat) : stat.getResetMulValue()) != (muls.containsKey(stat) ? muls.get(stat) : stat.getResetMulValue()))
+					{
+						changed.add(stat);
+					}
+				}
+				
+				_creature.broadcastModifiedStats(changed);
+			}
 		}
 		finally
 		{
 			_lock.writeLock().unlock();
 		}
-		
-		// Notify recalculation to child classes
-		onRecalculateStats(broadcast);
-		
-		if (broadcast && (adds != null) && (muls != null)) // adds and muls cannot be null when broadcast is true, but Eclipse throws warning bellow.
-		{
-			// Calculate the difference between old and new stats
-			final Set<Stat> changed = new HashSet<>();
-			for (Stat stat : Stat.values())
-			{
-				if ((_statsAdd.containsKey(stat) ? _statsAdd.get(stat) : stat.getResetAddValue()) != (adds.containsKey(stat) ? adds.get(stat) : stat.getResetAddValue()))
-				{
-					changed.add(stat);
-				}
-				else if ((_statsMul.containsKey(stat) ? _statsMul.get(stat) : stat.getResetMulValue()) != (muls.containsKey(stat) ? muls.get(stat) : stat.getResetMulValue()))
-				{
-					changed.add(stat);
-				}
-			}
-			
-			_creature.broadcastModifiedStats(changed);
-		}
 	}
 	
 	protected void onRecalculateStats(boolean broadcast)
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 ea17169ba6..bffe6681a9 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
@@ -977,33 +977,33 @@ public class CreatureStat
 			}
 			_attackSpeedMultiplier = Formulas.calcAtkSpdMultiplier(_creature);
 			_mAttackSpeedMultiplier = Formulas.calcMAtkSpdMultiplier(_creature);
+			
+			// Notify recalculation to child classes
+			onRecalculateStats(broadcast);
+			
+			if (broadcast && (adds != null) && (muls != null)) // adds and muls cannot be null when broadcast is true, but Eclipse throws warning bellow.
+			{
+				// Calculate the difference between old and new stats
+				final Set<Stat> changed = new HashSet<>();
+				for (Stat stat : Stat.values())
+				{
+					if ((_statsAdd.containsKey(stat) ? _statsAdd.get(stat) : stat.getResetAddValue()) != (adds.containsKey(stat) ? adds.get(stat) : stat.getResetAddValue()))
+					{
+						changed.add(stat);
+					}
+					else if ((_statsMul.containsKey(stat) ? _statsMul.get(stat) : stat.getResetMulValue()) != (muls.containsKey(stat) ? muls.get(stat) : stat.getResetMulValue()))
+					{
+						changed.add(stat);
+					}
+				}
+				
+				_creature.broadcastModifiedStats(changed);
+			}
 		}
 		finally
 		{
 			_lock.writeLock().unlock();
 		}
-		
-		// Notify recalculation to child classes
-		onRecalculateStats(broadcast);
-		
-		if (broadcast && (adds != null) && (muls != null)) // adds and muls cannot be null when broadcast is true, but Eclipse throws warning bellow.
-		{
-			// Calculate the difference between old and new stats
-			final Set<Stat> changed = new HashSet<>();
-			for (Stat stat : Stat.values())
-			{
-				if ((_statsAdd.containsKey(stat) ? _statsAdd.get(stat) : stat.getResetAddValue()) != (adds.containsKey(stat) ? adds.get(stat) : stat.getResetAddValue()))
-				{
-					changed.add(stat);
-				}
-				else if ((_statsMul.containsKey(stat) ? _statsMul.get(stat) : stat.getResetMulValue()) != (muls.containsKey(stat) ? muls.get(stat) : stat.getResetMulValue()))
-				{
-					changed.add(stat);
-				}
-			}
-			
-			_creature.broadcastModifiedStats(changed);
-		}
 	}
 	
 	protected void onRecalculateStats(boolean broadcast)
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 ea17169ba6..bffe6681a9 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
@@ -977,33 +977,33 @@ public class CreatureStat
 			}
 			_attackSpeedMultiplier = Formulas.calcAtkSpdMultiplier(_creature);
 			_mAttackSpeedMultiplier = Formulas.calcMAtkSpdMultiplier(_creature);
+			
+			// Notify recalculation to child classes
+			onRecalculateStats(broadcast);
+			
+			if (broadcast && (adds != null) && (muls != null)) // adds and muls cannot be null when broadcast is true, but Eclipse throws warning bellow.
+			{
+				// Calculate the difference between old and new stats
+				final Set<Stat> changed = new HashSet<>();
+				for (Stat stat : Stat.values())
+				{
+					if ((_statsAdd.containsKey(stat) ? _statsAdd.get(stat) : stat.getResetAddValue()) != (adds.containsKey(stat) ? adds.get(stat) : stat.getResetAddValue()))
+					{
+						changed.add(stat);
+					}
+					else if ((_statsMul.containsKey(stat) ? _statsMul.get(stat) : stat.getResetMulValue()) != (muls.containsKey(stat) ? muls.get(stat) : stat.getResetMulValue()))
+					{
+						changed.add(stat);
+					}
+				}
+				
+				_creature.broadcastModifiedStats(changed);
+			}
 		}
 		finally
 		{
 			_lock.writeLock().unlock();
 		}
-		
-		// Notify recalculation to child classes
-		onRecalculateStats(broadcast);
-		
-		if (broadcast && (adds != null) && (muls != null)) // adds and muls cannot be null when broadcast is true, but Eclipse throws warning bellow.
-		{
-			// Calculate the difference between old and new stats
-			final Set<Stat> changed = new HashSet<>();
-			for (Stat stat : Stat.values())
-			{
-				if ((_statsAdd.containsKey(stat) ? _statsAdd.get(stat) : stat.getResetAddValue()) != (adds.containsKey(stat) ? adds.get(stat) : stat.getResetAddValue()))
-				{
-					changed.add(stat);
-				}
-				else if ((_statsMul.containsKey(stat) ? _statsMul.get(stat) : stat.getResetMulValue()) != (muls.containsKey(stat) ? muls.get(stat) : stat.getResetMulValue()))
-				{
-					changed.add(stat);
-				}
-			}
-			
-			_creature.broadcastModifiedStats(changed);
-		}
 	}
 	
 	protected void onRecalculateStats(boolean broadcast)