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

- Removed some comments

Browse Source
This commit is contained in:
moomarc
2013-05-23 10:32:20 +00:00
parent fb96ba72db
commit 3da808546a
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/forge/card/trigger/Trigger.java
View File

@@ -185,7 +185,6 @@ public abstract class Trigger extends TriggerReplacementBase {
} }
if (this.mapParams.containsKey("FirstUpkeep")) { if (this.mapParams.containsKey("FirstUpkeep")) {
System.out.println("Upkeep condition: " + phaseHandler.isFirstUpkeep());
if (!phaseHandler.isFirstUpkeep()) { if (!phaseHandler.isFirstUpkeep()) {
return false; return false;
} }

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

@@ -253,8 +253,6 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable {
break; break;
case UPKEEP: case UPKEEP:
this.nUpkeepsThisTurn++;
System.out.println("Current upkeep: " + nUpkeepsThisTurn);
if (this.getPlayerTurn().hasKeyword("Skip your upkeep step.")) { if (this.getPlayerTurn().hasKeyword("Skip your upkeep step.")) {
// Slowtrips all say "on the next turn's upkeep" if there is no // Slowtrips all say "on the next turn's upkeep" if there is no
// upkeep next turn, the trigger will never occur. // upkeep next turn, the trigger will never occur.
@@ -263,6 +261,7 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable {
} }
this.setPlayersPriorityPermission(false); this.setPlayersPriorityPermission(false);
} else { } else {
this.nUpkeepsThisTurn++;
game.getUpkeep().executeUntil(this.getPlayerTurn()); game.getUpkeep().executeUntil(this.getPlayerTurn());
game.getUpkeep().executeAt(); game.getUpkeep().executeAt();
} }