From c032d1b0be944980fbd4feb408386246cb8577e9 Mon Sep 17 00:00:00 2001 From: Hans Mackowiak Date: Tue, 18 Apr 2023 10:12:56 +0200 Subject: [PATCH] Update ReplaceDamage.java --- .../main/java/forge/game/replacement/ReplaceDamage.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/forge-game/src/main/java/forge/game/replacement/ReplaceDamage.java b/forge-game/src/main/java/forge/game/replacement/ReplaceDamage.java index 492428caf38..cbd590a9d9f 100644 --- a/forge-game/src/main/java/forge/game/replacement/ReplaceDamage.java +++ b/forge-game/src/main/java/forge/game/replacement/ReplaceDamage.java @@ -120,13 +120,13 @@ public class ReplaceDamage extends ReplacementEffect { return false; } } else { - for (Player p : AbilityUtils.getDefinedPlayers(getHostCard(), def, null)) { - if (!game.getPlayers().contains(p)) { + for (Player p : AbilityUtils.getDefinedPlayers(getHostCard(), def, this)) { + if (!p.isInGame()) { return false; } } - for (Card c : AbilityUtils.getDefinedCards(getHostCard(), def, null)) { - if (!c.isCreature() && !c.isPlaneswalker()) { + for (Card c : AbilityUtils.getDefinedCards(getHostCard(), def, this)) { + if (!c.isCreature() && !c.isPlaneswalker() && !c.isBattle()) { return false; } if (!c.isInPlay()) {