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

* Fervent Champion - Fixed that it's possible to equip the Champion also without having the regular mana (#6698).

Browse source
This commit is contained in:
LevelX2 2020-07-27 22:27:11 +02:00
parent 6e68e038b6
commit 82dfd76ee3
4 changed files with 58 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Mage.Sets/src/mage/cards/f/FerventChampion.java
View file

@ -90,14 +90,22 @@ class FerventChampionEffect extends CostModificationEffectImpl {
@Override
public boolean applies(Ability abilityToModify, Ability source, Game game) {
return abilityToModify instanceof EquipAbility
&& abilityToModify.isControlledBy(source.getControllerId())
&& abilityToModify
if (abilityToModify instanceof EquipAbility
&& abilityToModify.isControlledBy(source.getControllerId())) {
if (game != null && game.inCheckPlayableState()) {
return !abilityToModify.getTargets().isEmpty() &&
abilityToModify.getTargets().get(0).canTarget(source.getSourceId(), abilityToModify, game);
} else {
return abilityToModify
.getTargets()
.stream()
.map(Target::getTargets)
.flatMap(Collection::stream)
.anyMatch(source.getSourceId()::equals);
.anyMatch(source.getSourceId()::equals);
}
}
return false;
}
@Override

2
Mage.Sets/src/mage/cards/s/SwordOfFireAndIce.java
View file

@ -41,7 +41,7 @@ public final class SwordOfFireAndIce extends CardImpl {
// Whenever equipped creature deals combat damage to a player, Sword of Fire
// and Ice deals 2 damage to any target and you draw a card.
this.addAbility(new SwordOfFireAndIceAbility());
// Equip
// Equip {2}
this.addAbility(new EquipAbility(Outcome.Benefit, new GenericManaCost(2)));
}