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

- Fixed clearAssignedDamage not being called during both players turns.

Browse Source
This commit is contained in:
Sloth
2012-07-12 17:24:14 +00:00
parent 0470181531
commit eced47651e
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -419,8 +419,6 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable {
break; break;
case CLEANUP: case CLEANUP:
this.getPlayerTurn().clearAssignedDamage();
// Reset Damage received map // Reset Damage received map
final CardList list = AllZoneUtil.getCardsIn(ZoneType.Battlefield); final CardList list = AllZoneUtil.getCardsIn(ZoneType.Battlefield);
for (final Card c : list) { for (final Card c : list) {
@@ -460,6 +458,7 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable {
player.resetNumDrawnThisTurn(); player.resetNumDrawnThisTurn();
player.setAttackedWithCreatureThisTurn(false); player.setAttackedWithCreatureThisTurn(false);
player.setNumLandsPlayed(0); player.setNumLandsPlayed(0);
player.clearAssignedDamage();
} }
this.getPlayerTurn().removeKeyword("Skip all combat phases of this turn."); this.getPlayerTurn().removeKeyword("Skip all combat phases of this turn.");
break; break;