From 514f5759310db106234db88005a049b75650ed3c Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Sun, 4 Nov 2012 15:59:22 +0000 Subject: [PATCH] rem warning, force update of player-related into at end of phase. --- .../effects/StoreSVarEffect.java | 1 - .../java/forge/game/phase/PhaseHandler.java | 21 +------------------ 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/src/main/java/forge/card/abilityfactory/effects/StoreSVarEffect.java b/src/main/java/forge/card/abilityfactory/effects/StoreSVarEffect.java index fd1bd16fff9..f21c0be9a96 100644 --- a/src/main/java/forge/card/abilityfactory/effects/StoreSVarEffect.java +++ b/src/main/java/forge/card/abilityfactory/effects/StoreSVarEffect.java @@ -1,7 +1,6 @@ package forge.card.abilityfactory.effects; import forge.Card; -import forge.card.abilityfactory.AbilityFactory; import forge.card.abilityfactory.SpellEffect; import forge.card.cardfactory.CardFactoryUtil; import forge.card.spellability.SpellAbility; diff --git a/src/main/java/forge/game/phase/PhaseHandler.java b/src/main/java/forge/game/phase/PhaseHandler.java index 3fbee8ee522..fb0cd46ed08 100644 --- a/src/main/java/forge/game/phase/PhaseHandler.java +++ b/src/main/java/forge/game/phase/PhaseHandler.java @@ -71,11 +71,6 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable { /** The need to next phase. */ private boolean isPlayerPriorityAllowed = false; - // This should only be true four times! that is for the initial nextPhases - // in MyObservable - /** The need to next phase init. */ - private int needToNextPhaseInit = 0; - private final GameState game; public PhaseHandler(final GameState game0) @@ -428,6 +423,7 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable { if (Singletons.getModel().getPreferences().getPrefBoolean(FPref.UI_MANABURN)) { p.loseLife(burn, null); } + p.updateObservers(); } switch (this.phase) { @@ -746,21 +742,6 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable { return this.isPlayerPriorityAllowed; } - /** - *

- * isNeedToNextPhaseInit. - *

- * - * @return a boolean. - */ - public final boolean isNeedToNextPhaseInit() { - this.needToNextPhaseInit++; - if (this.needToNextPhaseInit <= 4) { - return true; - } - return false; - } - // this is a hack for the setup game state mode, do not use outside of // devSetupGameState code // as it avoids calling any of the phase effects that may be necessary in a