|
|
@ -47,7 +47,6 @@ public class EffectsBase { |
|
|
|
|
|
|
|
|
|
|
|
public static HashMap<String, HashSet<AbstractEffectModifier>> modifiersMap = new HashMap<>(); |
|
|
|
public static HashMap<String, HashSet<AbstractEffectModifier>> modifiersMap = new HashMap<>(); |
|
|
|
public static HashMap<Integer, HashSet<mbEnums.DamageType>> EffectDamageTypes = new HashMap<>(); |
|
|
|
public static HashMap<Integer, HashSet<mbEnums.DamageType>> EffectDamageTypes = new HashMap<>(); |
|
|
|
public static HashSet<AbstractEffectModifier> DefaultModifiers = new HashSet<>(); |
|
|
|
|
|
|
|
private static ConcurrentHashMap<String, String> itemEffectsByName = new ConcurrentHashMap<>(MBServerStatics.CHM_INIT_CAP, MBServerStatics.CHM_LOAD, MBServerStatics.CHM_THREAD_LOW); |
|
|
|
private static ConcurrentHashMap<String, String> itemEffectsByName = new ConcurrentHashMap<>(MBServerStatics.CHM_INIT_CAP, MBServerStatics.CHM_LOAD, MBServerStatics.CHM_THREAD_LOW); |
|
|
|
private static int NewID = 3000; |
|
|
|
private static int NewID = 3000; |
|
|
|
private int UUID; |
|
|
|
private int UUID; |
|
|
@ -372,7 +371,7 @@ public class EffectsBase { |
|
|
|
public HashSet<AbstractEffectModifier> getModifiers() { |
|
|
|
public HashSet<AbstractEffectModifier> getModifiers() { |
|
|
|
|
|
|
|
|
|
|
|
if (EffectsBase.modifiersMap.containsKey(this.IDString) == false) |
|
|
|
if (EffectsBase.modifiersMap.containsKey(this.IDString) == false) |
|
|
|
return EffectsBase.DefaultModifiers; |
|
|
|
return new HashSet<>(); // was never used or assigned to?
|
|
|
|
|
|
|
|
|
|
|
|
return EffectsBase.modifiersMap.get(this.IDString); |
|
|
|
return EffectsBase.modifiersMap.get(this.IDString); |
|
|
|
} |
|
|
|
} |
|
|
|