mirror of
https://github.com/correl/mage.git
synced 2024-12-25 03:00:15 +00:00
fixed Rayami, First of the Fallen replacement effect not applying
This commit is contained in:
parent
a5fe53b2fc
commit
6417c0f244
1 changed files with 20 additions and 20 deletions
|
@ -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";
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue