Skip to content

AbilityManaPart: use Multiset for produced #10811

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Hanmac merged 1 commit into from
May 31, 2026
+12 −7
Merged

AbilityManaPart: use Multiset for produced #10811

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions forge-game/src/main/java/forge/game/spellability/AbilityManaPart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@
*/
package forge.game.spellability;

import com.google.common.collect.Lists;
import com.google.common.collect.HashMultiset;
import com.google.common.collect.Maps;
import com.google.common.collect.Multiset;

import forge.card.ColorSet;
import forge.card.GamePieceType;
import forge.card.MagicColor;
Expand Down Expand Up @@ -49,6 +52,7 @@
import forge.util.TextUtil;
import org.apache.commons.lang3.StringUtils;

import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
Expand Down Expand Up @@ -78,7 +82,7 @@ public class AbilityManaPart implements java.io.Serializable {
private final boolean persistentMana;
private final boolean combatMana;

private transient List<Mana> lastManaProduced = Lists.newArrayList();
private transient Multiset<Mana> lastManaProduced = HashMultiset.create();

private transient Card sourceCard;
private transient IHasSVars sVarHolder;
Expand Down Expand Up @@ -177,19 +181,20 @@ public final String produceMana(final String produced, final Player player, Spel
//clear lastProduced
this.lastManaProduced.clear();

// TODO use MagicColor
Map<Byte, Mana> manaHolder = Maps.newHashMap();

// loop over mana produced string
for (final String c : afterReplace.split(" ")) {
if (StringUtils.isNumeric(c)) {
for (int i = Integer.parseInt(c); i > 0; i--) {
this.lastManaProduced.add(new Mana((byte) ManaAtom.COLORLESS, source, this, player));
}
this.lastManaProduced.add(manaHolder.computeIfAbsent((byte) ManaAtom.COLORLESS, b -> new Mana(b, source, this, player)), Integer.parseInt(c));
} else {
byte attemptedMana = MagicColor.fromName(c);
if (attemptedMana == 0) {
attemptedMana = (byte)ManaAtom.COLORLESS;
}

this.lastManaProduced.add(new Mana(attemptedMana, source, this, player));
this.lastManaProduced.add(manaHolder.computeIfAbsent(attemptedMana, b -> new Mana(b, source, this, player)));
}
}

Expand Down Expand Up @@ -566,7 +571,7 @@ public void clearExpressChoice() {
*
* @return a {@link java.lang.String} object.
*/
public List<Mana> getLastManaProduced() {
public Collection<Mana> getLastManaProduced() {
return this.lastManaProduced;
}

Expand Down
Loading