Fixed onRecalculateStats adds and muls exception.
This commit is contained in:
@@ -20,7 +20,6 @@ import java.util.Arrays;
|
|||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.Deque;
|
import java.util.Deque;
|
||||||
import java.util.EnumMap;
|
import java.util.EnumMap;
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
import java.util.LinkedList;
|
import java.util.LinkedList;
|
||||||
@@ -734,8 +733,8 @@ public class CharStat
|
|||||||
public final void recalculateStats(boolean broadcast)
|
public final void recalculateStats(boolean broadcast)
|
||||||
{
|
{
|
||||||
// Copy old data before wiping it out
|
// Copy old data before wiping it out
|
||||||
final Map<Stats, Double> adds = !broadcast ? Collections.emptyMap() : new HashMap<>(_statsAdd);
|
final Map<Stats, Double> adds = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsAdd);
|
||||||
final Map<Stats, Double> muls = !broadcast ? Collections.emptyMap() : new HashMap<>(_statsMul);
|
final Map<Stats, Double> muls = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsMul);
|
||||||
|
|
||||||
_lock.writeLock().lock();
|
_lock.writeLock().lock();
|
||||||
try
|
try
|
||||||
|
@@ -20,7 +20,6 @@ import java.util.Arrays;
|
|||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.Deque;
|
import java.util.Deque;
|
||||||
import java.util.EnumMap;
|
import java.util.EnumMap;
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
import java.util.LinkedList;
|
import java.util.LinkedList;
|
||||||
@@ -734,8 +733,8 @@ public class CharStat
|
|||||||
public final void recalculateStats(boolean broadcast)
|
public final void recalculateStats(boolean broadcast)
|
||||||
{
|
{
|
||||||
// Copy old data before wiping it out
|
// Copy old data before wiping it out
|
||||||
final Map<Stats, Double> adds = !broadcast ? Collections.emptyMap() : new HashMap<>(_statsAdd);
|
final Map<Stats, Double> adds = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsAdd);
|
||||||
final Map<Stats, Double> muls = !broadcast ? Collections.emptyMap() : new HashMap<>(_statsMul);
|
final Map<Stats, Double> muls = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsMul);
|
||||||
|
|
||||||
_lock.writeLock().lock();
|
_lock.writeLock().lock();
|
||||||
try
|
try
|
||||||
|
@@ -20,7 +20,6 @@ import java.util.Arrays;
|
|||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.Deque;
|
import java.util.Deque;
|
||||||
import java.util.EnumMap;
|
import java.util.EnumMap;
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
import java.util.LinkedList;
|
import java.util.LinkedList;
|
||||||
@@ -734,8 +733,8 @@ public class CharStat
|
|||||||
public final void recalculateStats(boolean broadcast)
|
public final void recalculateStats(boolean broadcast)
|
||||||
{
|
{
|
||||||
// Copy old data before wiping it out
|
// Copy old data before wiping it out
|
||||||
final Map<Stats, Double> adds = !broadcast ? Collections.emptyMap() : new HashMap<>(_statsAdd);
|
final Map<Stats, Double> adds = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsAdd);
|
||||||
final Map<Stats, Double> muls = !broadcast ? Collections.emptyMap() : new HashMap<>(_statsMul);
|
final Map<Stats, Double> muls = !broadcast ? Collections.emptyMap() : new EnumMap<>(_statsMul);
|
||||||
|
|
||||||
_lock.writeLock().lock();
|
_lock.writeLock().lock();
|
||||||
try
|
try
|
||||||
|
Reference in New Issue
Block a user