From 12b350580a8517295976a43f54fcbccc5b680e19 Mon Sep 17 00:00:00 2001
From: MagicBot <MagicBot@magicbane.com>
Date: Sun, 16 Feb 2025 17:27:33 -0500
Subject: [PATCH] Token is primary key

---
 src/engine/objects/AbstractWorldObject.java | 2 +-
 src/engine/wpakpowers/WpakPowerManager.java | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

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<engine.wpak.data.Effect, ConcurrentHashMap<mbEnums.ModType, Integer>> _effects = new ConcurrentHashMap<>();
+    public ConcurrentHashMap<Integer, ConcurrentHashMap<mbEnums.ModType, Integer>> _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);
         }
 
     }