external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 18:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fixed cleanup of phased out cards.

Browse Source
This commit is contained in:
Sloth
2013-08-17 10:38:55 +00:00
parent 1ecb6728b1
commit 15c90a00cd
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/forge/game/phase/PhaseHandler.java
View File

@@ -372,7 +372,7 @@ public class PhaseHandler implements java.io.Serializable {
// Rule 514.2 // Rule 514.2
// Reset Damage received map // Reset Damage received map
for (final Card c : game.getCardsIn(ZoneType.Battlefield)) { for (final Card c : game.getCardsIncludePhasingIn(ZoneType.Battlefield)) {
c.onCleanupPhase(playerTurn); c.onCleanupPhase(playerTurn);
} }

4
src/main/java/forge/game/player/Player.java
View File

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