external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-12 08:48:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

revert multimap, needs better implementation for this

Browse Source
This commit is contained in:
kevlahnota
2024-11-15 13:40:27 +08:00
parent a094149ce0
commit b9a56f04e3
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
forge-game/src/main/java/forge/game/mana/ManaPool.java
View File

@@ -23,8 +23,11 @@ import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Multimap;
import com.google.common.collect.Multimaps;
import forge.card.mana.ManaAtom; import forge.card.mana.ManaAtom;
import forge.card.mana.ManaCostShard; import forge.card.mana.ManaCostShard;
import forge.game.Game; import forge.game.Game;
@@ -39,7 +42,6 @@ import forge.game.replacement.ReplacementType;
import forge.game.spellability.AbilityManaPart; import forge.game.spellability.AbilityManaPart;
import forge.game.spellability.SpellAbility; import forge.game.spellability.SpellAbility;
import forge.game.staticability.StaticAbilityUnspentMana; import forge.game.staticability.StaticAbilityUnspentMana;
import forge.util.collect.ConcurrentMultiValuedMap;
/** /**
* <p> * <p>
@@ -51,14 +53,14 @@ import forge.util.collect.ConcurrentMultiValuedMap;
*/ */
public class ManaPool extends ManaConversionMatrix implements Iterable<Mana> { public class ManaPool extends ManaConversionMatrix implements Iterable<Mana> {
private final Player owner; private final Player owner;
private ConcurrentMultiValuedMap<Byte, Mana> _floatingMana; private Multimap<Byte, Mana> _floatingMana;
private ConcurrentMultiValuedMap<Byte, Mana> floatingMana() { private Multimap<Byte, Mana> floatingMana() {
ConcurrentMultiValuedMap<Byte, Mana> result = _floatingMana; Multimap<Byte, Mana> result = _floatingMana;
if (result == null) { if (result == null) {
synchronized (this) { synchronized (this) {
result = _floatingMana; result = _floatingMana;
if (result == null) { if (result == null) {
result = new ConcurrentMultiValuedMap<>(); result = Multimaps.synchronizedMultimap(ArrayListMultimap.create());
_floatingMana = result; _floatingMana = result;
} }
} }
@@ -200,7 +202,7 @@ public class ManaPool extends ManaConversionMatrix implements Iterable<Mana> {
return removeMana(mana, true); return removeMana(mana, true);
} }
public boolean removeMana(final Mana mana, boolean updateView) { public boolean removeMana(final Mana mana, boolean updateView) {
boolean result = floatingMana().removeMapping(mana.getColor(), mana); boolean result = floatingMana().remove(mana.getColor(), mana);
if (result && updateView) { if (result && updateView) {
owner.updateManaForView(); owner.updateManaForView();
owner.getGame().fireEvent(new GameEventManaPool(owner, EventValueChangeType.Removed, mana)); owner.getGame().fireEvent(new GameEventManaPool(owner, EventValueChangeType.Removed, mana));