diff --git a/src/engine/objects/AbstractWorldObject.java b/src/engine/objects/AbstractWorldObject.java index 64aab6e4..e06295ee 100644 --- a/src/engine/objects/AbstractWorldObject.java +++ b/src/engine/objects/AbstractWorldObject.java @@ -63,7 +63,7 @@ public abstract class AbstractWorldObject extends AbstractGameObject { // Effects collection for wpak power manager - public ConcurrentHashMap> _effects = new ConcurrentHashMap<>(); + public ConcurrentHashMap> _effects = new ConcurrentHashMap<>(); /** * No Id Constructor diff --git a/src/engine/wpakpowers/WpakPowerManager.java b/src/engine/wpakpowers/WpakPowerManager.java index de8bf4b3..ce597185 100644 --- a/src/engine/wpakpowers/WpakPowerManager.java +++ b/src/engine/wpakpowers/WpakPowerManager.java @@ -328,20 +328,21 @@ public class WpakPowerManager { for(ActionEntry powerAction: power.actionEntries){ - Effect effect = effect_data.get(Hasher.SBStringHash(powerAction.effect_id)); + int powerToken = Hasher.SBStringHash(powerAction.effect_id); + Effect effect = effect_data.get(powerToken); if (effect == null) continue; // New entry for this power effect? - if (target._effects.containsKey(effect) == false) - target._effects.put(effect, new ConcurrentHashMap<>()); + if (target._effects.containsKey(powerToken) == false) + target._effects.put(powerToken, new ConcurrentHashMap<>()); // Write modifier values for (ModifierEntry modifierEntry : effect.mods) - target._effects.get(effect).put(modifierEntry.type, rank); + target._effects.get(powerToken).put(modifierEntry.type, rank); } }