diff --git a/src/main/java/forge/game/phase/PhaseHandler.java b/src/main/java/forge/game/phase/PhaseHandler.java index 17422cbf546..966777b33be 100644 --- a/src/main/java/forge/game/phase/PhaseHandler.java +++ b/src/main/java/forge/game/phase/PhaseHandler.java @@ -53,8 +53,8 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable { private static final long serialVersionUID = 5207222278370963197L; private PhaseType phase = PhaseType.UNTAP; - private int turn = 0; - // Start turn at 0, so first untap step will turn it to 1 + private int turn = 1; + // Start turn at 1, since first untap is where we start private final transient Stack extraTurns = new Stack(); private final transient Map> extraPhases = new HashMap>(); @@ -262,7 +262,7 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable { break; case DRAW: - if (getTurn() == 1 || PhaseUtil.skipDraw(this.getPlayerTurn())) { + if (getTurn() == 1 || this.getPlayerTurn().isSkippingDraw()) { this.setPlayersPriorityPermission(false); } else { this.getPlayerTurn().drawCards(1, true); diff --git a/src/main/java/forge/game/phase/PhaseUtil.java b/src/main/java/forge/game/phase/PhaseUtil.java index ee1e14b0668..ea4cdaa8e65 100644 --- a/src/main/java/forge/game/phase/PhaseUtil.java +++ b/src/main/java/forge/game/phase/PhaseUtil.java @@ -114,28 +114,7 @@ public class PhaseUtil { game.getPhaseHandler().setPlayersPriorityPermission(false); } - /** - *

- * skipDraw. - *

- * - * @param player - * a {@link forge.game.player.Player} object. - * @return a boolean. - */ - public static boolean skipDraw(final Player player) { - - if (player.hasKeyword("Skip your next draw step.")) { - player.removeKeyword("Skip your next draw step."); - return true; - } - - if (player.hasKeyword("Skip your draw step.")) { - return true; - } - - return false; - } + // ********* Declare Attackers *********** diff --git a/src/main/java/forge/game/player/Player.java b/src/main/java/forge/game/player/Player.java index a8d5cde84fd..8e7e8e7745a 100644 --- a/src/main/java/forge/game/player/Player.java +++ b/src/main/java/forge/game/player/Player.java @@ -3242,6 +3242,20 @@ public abstract class Player extends GameEntity implements Comparable { game.getStack().add(miracleTrigger); } + public boolean isSkippingDraw() { + + if (hasKeyword("Skip your next draw step.")) { + removeKeyword("Skip your next draw step."); + return true; + } + + if (hasKeyword("Skip your draw step.")) { + return true; + } + + return false; + } + /** * TODO: Write javadoc for this type. *