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

- Fixed NumLandsPlayed not being reset in Cleanup.

Browse Source
This commit is contained in:
Sloth
2012-07-11 16:42:02 +00:00
parent 6c95b18880
commit de7f64248d
2 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -302,15 +302,6 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable {
this.updateObservers(); this.updateObservers();
} }
/**
* <p>
* turnReset.
* </p>
*/
public final void turnReset() {
this.playerTurn.setNumLandsPlayed(0);
}
/** /**
* <p> * <p>
* handleBeginPhase. * handleBeginPhase.
@@ -468,6 +459,7 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable {
player.resetPreventNextDamage(); player.resetPreventNextDamage();
player.resetNumDrawnThisTurn(); player.resetNumDrawnThisTurn();
player.setAttackedWithCreatureThisTurn(false); player.setAttackedWithCreatureThisTurn(false);
player.setNumLandsPlayed(0);
} }
this.getPlayerTurn().removeKeyword("Skip all combat phases of this turn."); this.getPlayerTurn().removeKeyword("Skip all combat phases of this turn.");
break; break;

1
src/main/java/forge/game/phase/PhaseUtil.java
View File

@@ -82,7 +82,6 @@ public class PhaseUtil {
final PhaseHandler ph = Singletons.getModel().getGameState().getPhaseHandler(); final PhaseHandler ph = Singletons.getModel().getGameState().getPhaseHandler();
final Player turn = ph.getPlayerTurn(); final Player turn = ph.getPlayerTurn();
ph.turnReset();
Singletons.getModel().getGameSummary().notifyNextTurn(); Singletons.getModel().getGameSummary().notifyNextTurn();
CMessage.SINGLETON_INSTANCE.updateGameInfo(); CMessage.SINGLETON_INSTANCE.updateGameInfo();