Browse Source

Only type is needed for key

feature-config-usage
MagicBot 6 days ago
parent
commit
78dd409fa8
  1. 4
      src/engine/objects/AbstractWorldObject.java
  2. 2
      src/engine/wpakpowers/WpakPowerManager.java

4
src/engine/objects/AbstractWorldObject.java

@ -20,6 +20,7 @@ import engine.math.AtomicFloat;
import engine.math.Bounds; import engine.math.Bounds;
import engine.math.Vector3f; import engine.math.Vector3f;
import engine.math.Vector3fImmutable; import engine.math.Vector3fImmutable;
import engine.mbEnums;
import engine.mbEnums.DispatchChannel; import engine.mbEnums.DispatchChannel;
import engine.mbEnums.EffectSourceType; import engine.mbEnums.EffectSourceType;
import engine.mbEnums.GameObjectType; import engine.mbEnums.GameObjectType;
@ -29,7 +30,6 @@ import engine.net.client.ClientConnection;
import engine.net.client.msg.UpdateEffectsMsg; import engine.net.client.msg.UpdateEffectsMsg;
import engine.powers.EffectsBase; import engine.powers.EffectsBase;
import engine.server.MBServerStatics; import engine.server.MBServerStatics;
import engine.wpak.data.ModifierEntry;
import org.pmw.tinylog.Logger; import org.pmw.tinylog.Logger;
import java.sql.ResultSet; import java.sql.ResultSet;
@ -63,7 +63,7 @@ public abstract class AbstractWorldObject extends AbstractGameObject {
// Effects collection for wpak power manager // Effects collection for wpak power manager
public ConcurrentHashMap<engine.wpak.data.Effect, ConcurrentHashMap<ModifierEntry, Integer>> _effects = new ConcurrentHashMap<>(); public ConcurrentHashMap<engine.wpak.data.Effect, ConcurrentHashMap<mbEnums.ModType, Integer>> _effects = new ConcurrentHashMap<>();
/** /**
* No Id Constructor * No Id Constructor

2
src/engine/wpakpowers/WpakPowerManager.java

@ -341,7 +341,7 @@ public class WpakPowerManager {
// Write modifier values // Write modifier values
for (ModifierEntry modifierEntry : effect.mods) for (ModifierEntry modifierEntry : effect.mods)
target._effects.get(effect).put(modifierEntry, rank); target._effects.get(effect).put(modifierEntry.type, rank);
} }
} }

Loading…
Cancel
Save