Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Fixed multiple calls of mana choice dialogs, related to #6132

Browse source
This commit is contained in:
Oleg Agafonov 2019-12-31 20:24:25 +04:00
parent ff9b1b5b13
commit 4445f8556e
5 changed files with 47 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Mage/src/main/java/mage/abilities/effects/mana/AddManaInAnyCombinationEffect.java
View file

@ -1,9 +1,5 @@
package mage.abilities.effects.mana;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import mage.Mana;
import mage.abilities.Ability;
import mage.abilities.dynamicvalue.DynamicValue;
@ -14,8 +10,11 @@ import mage.game.Game;
import mage.players.Player;
import mage.util.CardUtil;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
*
* @author LevelX2
*/
public class AddManaInAnyCombinationEffect extends ManaEffect {
@ -64,6 +63,16 @@ public class AddManaInAnyCombinationEffect extends ManaEffect {
return new AddManaInAnyCombinationEffect(this);
}
@Override
public List<Mana> getNetMana(Game game, Ability source) {
ArrayList<Mana> netMana = new ArrayList<>();
int amountOfManaLeft = amount.calculate(game, source, this);
if (amountOfManaLeft > 0) {
netMana.add(Mana.AnyMana(amountOfManaLeft));
}
return netMana;
}
@Override
public Mana produceMana(Game game, Ability source) {
Player player = game.getPlayer(source.getControllerId());
@ -93,13 +102,6 @@ public class AddManaInAnyCombinationEffect extends ManaEffect {
return null;
}
@Override
public List<Mana> getNetMana(Game game, Ability source) {
ArrayList<Mana> netMana = new ArrayList<>();
netMana.add(new Mana(0, 0, 0, 0, 0, 0, amount.calculate(game, source, this), 0));
return netMana;
}
private String setText() {
StringBuilder sb = new StringBuilder("Add ");
sb.append(CardUtil.numberToText(amount.toString()));
@ -116,7 +118,6 @@ public class AddManaInAnyCombinationEffect extends ManaEffect {
sb.append('{').append(coloredManaSymbol.toString()).append('}');
}
}
sb.append("");
return sb.toString();
}
}