External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-20 02:30:08 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge d507b76f41 into acc180d1d4

Browse source
This commit is contained in:
Will Wroble 2025-12-16 15:37:14 -06:00 • committed by GitHub
commit a823d13ed5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Mage/src/main/java/mage/abilities/mana/ManaOptions.java
View file

@ -3,6 +3,7 @@ package mage.abilities.mana;
import mage.ConditionalMana;
import mage.Mana;
import mage.abilities.Ability;
import mage.abilities.condition.Condition;
import mage.constants.ManaType;
import mage.game.Game;
import mage.game.events.GameEvent;
@ -61,34 +62,20 @@ public class ManaOptions extends LinkedHashSet<Mana> {
} else { // mana source has more than 1 ability
//perform a union of all existing options and the new options
List<Mana> copy = new ArrayList<>(this);
this.clear();
ManaOptions out = new ManaOptions();
for (ActivatedManaAbilityImpl ability : abilities) {
for (Mana netMana : ability.getNetMana(game)) {
checkManaReplacementAndTriggeredMana(ability, game, netMana);
for (Mana triggeredManaVariation : getTriggeredManaVariations(game, ability, netMana)) {
SkipAddMana:
for (Mana mana : copy) {
Mana newMana = new Mana();
newMana.add(mana);
newMana.add(triggeredManaVariation);
for (Mana existingMana : this) {
if (existingMana.equalManaValue(newMana)) {
continue SkipAddMana;
}
Mana moreValuable = Mana.getMoreValuableMana(newMana, existingMana);
if (moreValuable != null) {
// only keep the more valuable mana
existingMana.setToMana(moreValuable);
continue SkipAddMana;
ManaOptions copy = new ManaOptions(this);
copy.addMana(triggeredManaVariation);
out.addAll(copy);
}
}
this.add(newMana);
}
}
}
}
out.removeFullyIncludedVariations();
this.clear();
this.addAll(out);
}
}
@ -348,7 +335,6 @@ public class ManaOptions extends LinkedHashSet<Mana> {
}
}
}
public void addMana(ManaOptions options) {
if (isEmpty()) {
this.add(new Mana());