Fixed recalculateStats deadlock.

L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/actor/stat/CharStat.java

@@ -732,14 +732,14 @@ public class CharStat
 	 * @param broadcast
 	 */
 	public final void recalculateStats(boolean broadcast)
-	{
-		_lock.writeLock().lock();
-		try
 	{
 		// Copy old data before wiping it out
 		final Map<Stats, Double> adds = !broadcast ? Collections.emptyMap() : new HashMap<>(_statsAdd);
 		final Map<Stats, Double> muls = !broadcast ? Collections.emptyMap() : new HashMap<>(_statsMul);
 		
+		_lock.writeLock().lock();
+		try
+		{
 			// Wipe all the data
 			resetStats();
 			
@@ -760,6 +760,11 @@ public class CharStat
 			// Merge with additional stats
 			_additionalAdd.stream().filter(holder -> holder.verifyCondition(_activeChar)).forEach(holder -> mergeAdd(holder.getStat(), holder.getValue()));
 			_additionalMul.stream().filter(holder -> holder.verifyCondition(_activeChar)).forEach(holder -> mergeMul(holder.getStat(), holder.getValue()));
+		}
+		finally
+		{
+			_lock.writeLock().unlock();
+		}
 		
 		// Notify recalculation to child classes
 		onRecalculateStats(broadcast);
@@ -783,11 +788,6 @@ public class CharStat
 			_activeChar.broadcastModifiedStats(changed);
 		}
 	}
-		finally
-		{
-			_lock.writeLock().unlock();
-		}
-	}
 	
 	protected void onRecalculateStats(boolean broadcast)
 	{

L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/actor/stat/CharStat.java

@@ -732,14 +732,14 @@ public class CharStat
 	 * @param broadcast
 	 */
 	public final void recalculateStats(boolean broadcast)
-	{
-		_lock.writeLock().lock();
-		try
 	{
 		// Copy old data before wiping it out
 		final Map<Stats, Double> adds = !broadcast ? Collections.emptyMap() : new HashMap<>(_statsAdd);
 		final Map<Stats, Double> muls = !broadcast ? Collections.emptyMap() : new HashMap<>(_statsMul);
 		
+		_lock.writeLock().lock();
+		try
+		{
 			// Wipe all the data
 			resetStats();
 			
@@ -760,6 +760,11 @@ public class CharStat
 			// Merge with additional stats
 			_additionalAdd.stream().filter(holder -> holder.verifyCondition(_activeChar)).forEach(holder -> mergeAdd(holder.getStat(), holder.getValue()));
 			_additionalMul.stream().filter(holder -> holder.verifyCondition(_activeChar)).forEach(holder -> mergeMul(holder.getStat(), holder.getValue()));
+		}
+		finally
+		{
+			_lock.writeLock().unlock();
+		}
 		
 		// Notify recalculation to child classes
 		onRecalculateStats(broadcast);
@@ -783,11 +788,6 @@ public class CharStat
 			_activeChar.broadcastModifiedStats(changed);
 		}
 	}
-		finally
-		{
-			_lock.writeLock().unlock();
-		}
-	}
 	
 	protected void onRecalculateStats(boolean broadcast)
 	{

L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/actor/stat/CharStat.java

@@ -732,14 +732,14 @@ public class CharStat
 	 * @param broadcast
 	 */
 	public final void recalculateStats(boolean broadcast)
-	{
-		_lock.writeLock().lock();
-		try
 	{
 		// Copy old data before wiping it out
 		final Map<Stats, Double> adds = !broadcast ? Collections.emptyMap() : new HashMap<>(_statsAdd);
 		final Map<Stats, Double> muls = !broadcast ? Collections.emptyMap() : new HashMap<>(_statsMul);
 		
+		_lock.writeLock().lock();
+		try
+		{
 			// Wipe all the data
 			resetStats();
 			
@@ -760,6 +760,11 @@ public class CharStat
 			// Merge with additional stats
 			_additionalAdd.stream().filter(holder -> holder.verifyCondition(_activeChar)).forEach(holder -> mergeAdd(holder.getStat(), holder.getValue()));
 			_additionalMul.stream().filter(holder -> holder.verifyCondition(_activeChar)).forEach(holder -> mergeMul(holder.getStat(), holder.getValue()));
+		}
+		finally
+		{
+			_lock.writeLock().unlock();
+		}
 		
 		// Notify recalculation to child classes
 		onRecalculateStats(broadcast);
@@ -783,11 +788,6 @@ public class CharStat
 			_activeChar.broadcastModifiedStats(changed);
 		}
 	}
-		finally
-		{
-			_lock.writeLock().unlock();
-		}
-	}
 	
 	protected void onRecalculateStats(boolean broadcast)
 	{