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

* Benthic Explorer - Fixed mana type calculation.

Browse source 
* DynamicManaEffect - Fixed mana type calculation.
Some code clean up.
This commit is contained in:
LevelX2 2020-08-07 17:15:06 +02:00
parent 66d5b915db
commit 457557852e
7 changed files with 148 additions and 193 deletions
Download patch file Download diff file Expand all files Collapse all files

35
Mage/src/main/java/mage/abilities/effects/common/ManaEffect.java
View file

@ -92,41 +92,10 @@ public abstract class ManaEffect extends OneShotEffect {
* @return
*/
public Set<ManaType> getProducableManaTypes(Game game, Ability source) {
return getManaTypesFromManaList(getNetMana(game, source));
}
public static Set<ManaType> getManaTypesFromManaList(List<Mana> manaList) {
Set<ManaType> manaTypes = new HashSet<>();
for (Mana mana : manaList) {
if (mana.getAny() > 0) {
manaTypes.add(ManaType.BLACK);
manaTypes.add(ManaType.BLUE);
manaTypes.add(ManaType.GREEN);
manaTypes.add(ManaType.WHITE);
manaTypes.add(ManaType.RED);
}
if (mana.getBlack() > 0) {
manaTypes.add(ManaType.BLACK);
}
if (mana.getBlue() > 0) {
manaTypes.add(ManaType.BLUE);
}
if (mana.getGreen() > 0) {
manaTypes.add(ManaType.GREEN);
}
if (mana.getWhite() > 0) {
manaTypes.add(ManaType.WHITE);
}
if (mana.getRed() > 0) {
manaTypes.add(ManaType.RED);
}
if (mana.getColorless() > 0) {
manaTypes.add(ManaType.COLORLESS);
}
}
return manaTypes;
return ManaType.getManaTypesFromManaList(getNetMana(game, source));
}
/**
* Produced the mana the effect can produce (DO NOT add it to mana pool --
* return all added as mana object to process by replace events)