From add7ab382ab827823f5f6896538271deed5252c9 Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Mon, 18 Feb 2013 08:00:01 +0000 Subject: [PATCH] Fixes phase skipping for human --- .../java/forge/game/player/PlayerController.java | 4 +--- .../forge/game/player/PlayerControllerHuman.java | 13 ++----------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/src/main/java/forge/game/player/PlayerController.java b/src/main/java/forge/game/player/PlayerController.java index 1e0bc74ba9b..001419c3c33 100644 --- a/src/main/java/forge/game/player/PlayerController.java +++ b/src/main/java/forge/game/player/PlayerController.java @@ -49,14 +49,12 @@ public abstract class PlayerController { public boolean mayAutoPass(PhaseType phase) { - return phase.isBefore(autoPassUntil); } public boolean isUiSetToSkipPhase(final Player turn, final PhaseType phase) { - boolean isLocalPlayer = getPlayer().equals(Singletons.getControl().getPlayer()); - return isLocalPlayer && !CMatchUI.SINGLETON_INSTANCE.stopAtPhase(turn, phase); + return false; // human has it's overload } /** diff --git a/src/main/java/forge/game/player/PlayerControllerHuman.java b/src/main/java/forge/game/player/PlayerControllerHuman.java index b8534c6aa7b..9e1fb50ce8a 100644 --- a/src/main/java/forge/game/player/PlayerControllerHuman.java +++ b/src/main/java/forge/game/player/PlayerControllerHuman.java @@ -34,9 +34,6 @@ import forge.item.CardPrinted; */ public class PlayerControllerHuman extends PlayerController { - - private PhaseType autoPassUntil = null; - private final Input defaultInput; private final Input blockInput; private final Input cleanupInput; @@ -55,15 +52,9 @@ public class PlayerControllerHuman extends PlayerController { cleanupInput = new InputCleanup(game); } - public boolean mayAutoPass(PhaseType phase) { - - return phase.isBefore(autoPassUntil); - } - - + @Override public boolean isUiSetToSkipPhase(final Player turn, final PhaseType phase) { - boolean isLocalPlayer = getPlayer().equals(Singletons.getControl().getPlayer()); - return isLocalPlayer && !CMatchUI.SINGLETON_INSTANCE.stopAtPhase(turn, phase); + return !CMatchUI.SINGLETON_INSTANCE.stopAtPhase(turn, phase); } /**