diff --git a/src/main/java/forge/game/phase/PhaseHandler.java b/src/main/java/forge/game/phase/PhaseHandler.java index 48301827212..9633987361a 100644 --- a/src/main/java/forge/game/phase/PhaseHandler.java +++ b/src/main/java/forge/game/phase/PhaseHandler.java @@ -372,7 +372,7 @@ public class PhaseHandler implements java.io.Serializable { // Rule 514.2 // Reset Damage received map - for (final Card c : game.getCardsIn(ZoneType.Battlefield)) { + for (final Card c : game.getCardsIncludePhasingIn(ZoneType.Battlefield)) { c.onCleanupPhase(playerTurn); } diff --git a/src/main/java/forge/game/player/Player.java b/src/main/java/forge/game/player/Player.java index cb4b81fbd8e..8b01fa16373 100644 --- a/src/main/java/forge/game/player/Player.java +++ b/src/main/java/forge/game/player/Player.java @@ -1411,7 +1411,7 @@ public class Player extends GameEntity implements Comparable { * the zone * @return a List with all the cards currently in requested zone */ - public final List getCardsIn(final ZoneType zoneType, boolean includePhasedOut) { + public final List getCardsIn(final ZoneType zoneType, boolean filterOutPhasedOut) { List result; if (zoneType == ZoneType.Stack) { result = new ArrayList(); @@ -1422,7 +1422,7 @@ public class Player extends GameEntity implements Comparable { } } else { PlayerZone zone = this.getZone(zoneType); - result = zone == null ? null : zone.getCards(includePhasedOut); + result = zone == null ? null : zone.getCards(filterOutPhasedOut); } return result; }