From 15c90a00cdbfc9ea2aaa79e19a6f5b1b7cc66924 Mon Sep 17 00:00:00 2001
From: Sloth <sloth@cardforge.org>
Date: Sat, 17 Aug 2013 10:38:55 +0000
Subject: [PATCH] - Fixed cleanup of phased out cards.

---
 src/main/java/forge/game/phase/PhaseHandler.java | 2 +-
 src/main/java/forge/game/player/Player.java      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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<Player> {
      *            the zone
      * @return a List<Card> with all the cards currently in requested zone
      */
-    public final List<Card> getCardsIn(final ZoneType zoneType, boolean includePhasedOut) {
+    public final List<Card> getCardsIn(final ZoneType zoneType, boolean filterOutPhasedOut) {
         List<Card> result;
         if (zoneType == ZoneType.Stack) {
             result = new ArrayList<Card>();
@@ -1422,7 +1422,7 @@ public class Player extends GameEntity implements Comparable<Player> {
             }
         } else {
             PlayerZone zone = this.getZone(zoneType);
-            result = zone == null ? null : zone.getCards(includePhasedOut);
+            result = zone == null ? null : zone.getCards(filterOutPhasedOut);
         }
         return result;
     }