lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed recalculateStats deadlock.

Browse Source
This commit is contained in:
MobiusDev
2017-06-05 11:29:24 +00:00
parent 5e5f657487
commit 8be0616128
3 changed files with 78 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/actor/stat/CharStat.java
View File

@@ -733,13 +733,13 @@ public class CharStat
*/ */
public final void recalculateStats(boolean broadcast) public final void recalculateStats(boolean broadcast)
{ {
// 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(); _lock.writeLock().lock();
try 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);
// Wipe all the data // Wipe all the data
resetStats(); resetStats();
@@ -760,33 +760,33 @@ public class CharStat
// Merge with additional stats // Merge with additional stats
_additionalAdd.stream().filter(holder -> holder.verifyCondition(_activeChar)).forEach(holder -> mergeAdd(holder.getStat(), holder.getValue())); _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())); _additionalMul.stream().filter(holder -> holder.verifyCondition(_activeChar)).forEach(holder -> mergeMul(holder.getStat(), holder.getValue()));
// Notify recalculation to child classes
onRecalculateStats(broadcast);
if (broadcast)
{
// Calculate the difference between old and new stats
final Set<Stats> changed = new HashSet<>();
for (Stats stat : Stats.values())
{
if (_statsAdd.getOrDefault(stat, stat.getResetAddValue()) != adds.getOrDefault(stat, stat.getResetAddValue()))
{
changed.add(stat);
}
else if (_statsMul.getOrDefault(stat, stat.getResetMulValue()) != muls.getOrDefault(stat, stat.getResetMulValue()))
{
changed.add(stat);
}
}
_activeChar.broadcastModifiedStats(changed);
}
} }
finally finally
{ {
_lock.writeLock().unlock(); _lock.writeLock().unlock();
} }
// Notify recalculation to child classes
onRecalculateStats(broadcast);
if (broadcast)
{
// Calculate the difference between old and new stats
final Set<Stats> changed = new HashSet<>();
for (Stats stat : Stats.values())
{
if (_statsAdd.getOrDefault(stat, stat.getResetAddValue()) != adds.getOrDefault(stat, stat.getResetAddValue()))
{
changed.add(stat);
}
else if (_statsMul.getOrDefault(stat, stat.getResetMulValue()) != muls.getOrDefault(stat, stat.getResetMulValue()))
{
changed.add(stat);
}
}
_activeChar.broadcastModifiedStats(changed);
}
} }
protected void onRecalculateStats(boolean broadcast) protected void onRecalculateStats(boolean broadcast)

52
L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/actor/stat/CharStat.java
View File

@@ -733,13 +733,13 @@ public class CharStat
*/ */
public final void recalculateStats(boolean broadcast) public final void recalculateStats(boolean broadcast)
{ {
// 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(); _lock.writeLock().lock();
try 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);
// Wipe all the data // Wipe all the data
resetStats(); resetStats();
@@ -760,33 +760,33 @@ public class CharStat
// Merge with additional stats // Merge with additional stats
_additionalAdd.stream().filter(holder -> holder.verifyCondition(_activeChar)).forEach(holder -> mergeAdd(holder.getStat(), holder.getValue())); _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())); _additionalMul.stream().filter(holder -> holder.verifyCondition(_activeChar)).forEach(holder -> mergeMul(holder.getStat(), holder.getValue()));
// Notify recalculation to child classes
onRecalculateStats(broadcast);
if (broadcast)
{
// Calculate the difference between old and new stats
final Set<Stats> changed = new HashSet<>();
for (Stats stat : Stats.values())
{
if (_statsAdd.getOrDefault(stat, stat.getResetAddValue()) != adds.getOrDefault(stat, stat.getResetAddValue()))
{
changed.add(stat);
}
else if (_statsMul.getOrDefault(stat, stat.getResetMulValue()) != muls.getOrDefault(stat, stat.getResetMulValue()))
{
changed.add(stat);
}
}
_activeChar.broadcastModifiedStats(changed);
}
} }
finally finally
{ {
_lock.writeLock().unlock(); _lock.writeLock().unlock();
} }
// Notify recalculation to child classes
onRecalculateStats(broadcast);
if (broadcast)
{
// Calculate the difference between old and new stats
final Set<Stats> changed = new HashSet<>();
for (Stats stat : Stats.values())
{
if (_statsAdd.getOrDefault(stat, stat.getResetAddValue()) != adds.getOrDefault(stat, stat.getResetAddValue()))
{
changed.add(stat);
}
else if (_statsMul.getOrDefault(stat, stat.getResetMulValue()) != muls.getOrDefault(stat, stat.getResetMulValue()))
{
changed.add(stat);
}
}
_activeChar.broadcastModifiedStats(changed);
}
} }
protected void onRecalculateStats(boolean broadcast) protected void onRecalculateStats(boolean broadcast)

52
L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/actor/stat/CharStat.java
View File

@@ -733,13 +733,13 @@ public class CharStat
*/ */
public final void recalculateStats(boolean broadcast) public final void recalculateStats(boolean broadcast)
{ {
// 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(); _lock.writeLock().lock();
try 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);
// Wipe all the data // Wipe all the data
resetStats(); resetStats();
@@ -760,33 +760,33 @@ public class CharStat
// Merge with additional stats // Merge with additional stats
_additionalAdd.stream().filter(holder -> holder.verifyCondition(_activeChar)).forEach(holder -> mergeAdd(holder.getStat(), holder.getValue())); _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())); _additionalMul.stream().filter(holder -> holder.verifyCondition(_activeChar)).forEach(holder -> mergeMul(holder.getStat(), holder.getValue()));
// Notify recalculation to child classes
onRecalculateStats(broadcast);
if (broadcast)
{
// Calculate the difference between old and new stats
final Set<Stats> changed = new HashSet<>();
for (Stats stat : Stats.values())
{
if (_statsAdd.getOrDefault(stat, stat.getResetAddValue()) != adds.getOrDefault(stat, stat.getResetAddValue()))
{
changed.add(stat);
}
else if (_statsMul.getOrDefault(stat, stat.getResetMulValue()) != muls.getOrDefault(stat, stat.getResetMulValue()))
{
changed.add(stat);
}
}
_activeChar.broadcastModifiedStats(changed);
}
} }
finally finally
{ {
_lock.writeLock().unlock(); _lock.writeLock().unlock();
} }
// Notify recalculation to child classes
onRecalculateStats(broadcast);
if (broadcast)
{
// Calculate the difference between old and new stats
final Set<Stats> changed = new HashSet<>();
for (Stats stat : Stats.values())
{
if (_statsAdd.getOrDefault(stat, stat.getResetAddValue()) != adds.getOrDefault(stat, stat.getResetAddValue()))
{
changed.add(stat);
}
else if (_statsMul.getOrDefault(stat, stat.getResetMulValue()) != muls.getOrDefault(stat, stat.getResetMulValue()))
{
changed.add(stat);
}
}
_activeChar.broadcastModifiedStats(changed);
}
} }
protected void onRecalculateStats(boolean broadcast) protected void onRecalculateStats(boolean broadcast)