From 3da808546af4e0e29aa925ab3bf8f236e9075175 Mon Sep 17 00:00:00 2001 From: moomarc Date: Thu, 23 May 2013 10:32:20 +0000 Subject: [PATCH] - Removed some comments --- src/main/java/forge/card/trigger/Trigger.java | 1 - src/main/java/forge/game/phase/PhaseHandler.java | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/forge/card/trigger/Trigger.java b/src/main/java/forge/card/trigger/Trigger.java index 08a3c2f5f58..7c5039c581c 100644 --- a/src/main/java/forge/card/trigger/Trigger.java +++ b/src/main/java/forge/card/trigger/Trigger.java @@ -185,7 +185,6 @@ public abstract class Trigger extends TriggerReplacementBase { } if (this.mapParams.containsKey("FirstUpkeep")) { - System.out.println("Upkeep condition: " + phaseHandler.isFirstUpkeep()); if (!phaseHandler.isFirstUpkeep()) { return false; } diff --git a/src/main/java/forge/game/phase/PhaseHandler.java b/src/main/java/forge/game/phase/PhaseHandler.java index 30c87a23148..ed4ec13cf7f 100644 --- a/src/main/java/forge/game/phase/PhaseHandler.java +++ b/src/main/java/forge/game/phase/PhaseHandler.java @@ -253,8 +253,6 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable { break; case UPKEEP: - this.nUpkeepsThisTurn++; - System.out.println("Current upkeep: " + nUpkeepsThisTurn); if (this.getPlayerTurn().hasKeyword("Skip your upkeep step.")) { // Slowtrips all say "on the next turn's upkeep" if there is no // upkeep next turn, the trigger will never occur. @@ -263,6 +261,7 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable { } this.setPlayersPriorityPermission(false); } else { + this.nUpkeepsThisTurn++; game.getUpkeep().executeUntil(this.getPlayerTurn()); game.getUpkeep().executeAt(); }