From 6417c0f244afadc1bc2cba509bf4ba5b0097396e Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Wed, 11 Sep 2019 17:02:09 -0400 Subject: [PATCH] fixed Rayami, First of the Fallen replacement effect not applying --- .../mage/cards/r/RayamiFirstOfTheFallen.java | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/Mage.Sets/src/mage/cards/r/RayamiFirstOfTheFallen.java b/Mage.Sets/src/mage/cards/r/RayamiFirstOfTheFallen.java index 1aa9e4d039e..dcdac69a328 100644 --- a/Mage.Sets/src/mage/cards/r/RayamiFirstOfTheFallen.java +++ b/Mage.Sets/src/mage/cards/r/RayamiFirstOfTheFallen.java @@ -18,6 +18,7 @@ import mage.game.permanent.Permanent; import mage.game.permanent.PermanentToken; import mage.players.Player; +import java.util.Collection; import java.util.UUID; /** @@ -76,25 +77,24 @@ class RayamiFirstOfTheFallenEffect extends ContinuousEffectImpl { .stream() .filter(Card::isCreature) .filter(card -> card.getCounters(game).getCount(CounterType.BLOOD) > 0) - .forEach(card -> { - card.getAbilities(game).stream().forEach(ability -> { - if (ability instanceof FlyingAbility - || ability instanceof FirstStrikeAbility - || ability instanceof DoubleStrikeAbility - || ability instanceof DeathtouchAbility - || ability instanceof HasteAbility - || ability instanceof HexproofAbility - || ability instanceof IndestructibleAbility - || ability instanceof LifelinkAbility - || ability instanceof MenaceAbility - || ability instanceof ReachAbility - || ability instanceof TrampleAbility - || ability instanceof VigilanceAbility) { - sourcePermanent.addAbility(ability, source.getSourceId(), game); - } else if (ability instanceof ProtectionAbility) { - sourcePermanent.addAbility(ability, source.getSourceId(), game); - } - }); + .map(card -> card.getAbilities(game)) + .flatMap(Collection::stream) + .forEach(ability -> { + if (ability instanceof FlyingAbility + || ability instanceof FirstStrikeAbility + || ability instanceof DoubleStrikeAbility + || ability instanceof DeathtouchAbility + || ability instanceof HasteAbility + || ability instanceof HexproofAbility + || ability instanceof IndestructibleAbility + || ability instanceof LifelinkAbility + || ability instanceof MenaceAbility + || ability instanceof ReachAbility + || ability instanceof TrampleAbility + || ability instanceof VigilanceAbility + || ability instanceof ProtectionAbility) { + sourcePermanent.addAbility(ability, source.getSourceId(), game); + } }); return true; } @@ -108,7 +108,7 @@ class RayamiFirstOfTheFallenEffect extends ContinuousEffectImpl { class RayamiFirstOfTheFallenReplacementEffect extends ReplacementEffectImpl { RayamiFirstOfTheFallenReplacementEffect() { - super(Duration.EndOfTurn, Outcome.Exile); + super(Duration.WhileOnBattlefield, Outcome.Exile); staticText = "If a nontoken creature would die, exile that card with a blood counter on it instead"; }