diff --git a/Mage.Sets/src/mage/sets/coldsnap/FuryOfTheHorde.java b/Mage.Sets/src/mage/sets/coldsnap/FuryOfTheHorde.java index 85dfdf8e1ab..6210b029408 100644 --- a/Mage.Sets/src/mage/sets/coldsnap/FuryOfTheHorde.java +++ b/Mage.Sets/src/mage/sets/coldsnap/FuryOfTheHorde.java @@ -143,8 +143,8 @@ class FuryOfTheHordeAddPhasesEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { // 15.07.2006 If it's somehow not a main phase when Fury of the Horde resolves, all it does is untap all creatures that attacked that turn. No new phases are created. - if (game.getTurn().getPhaseType().equals(TurnPhase.PRECOMBAT_MAIN) - || game.getTurn().getPhaseType().equals(TurnPhase.POSTCOMBAT_MAIN) ) { + if (TurnPhase.PRECOMBAT_MAIN.equals(game.getTurn().getPhaseType()) + || TurnPhase.POSTCOMBAT_MAIN.equals(game.getTurn().getPhaseType()) ) { // we can't add two turn modes at once, will add additional post combat on delayed trigger resolution TurnMod combat = new TurnMod(source.getControllerId(), TurnPhase.COMBAT, TurnPhase.POSTCOMBAT_MAIN, false); game.getState().getTurnMods().add(combat); diff --git a/Mage.Sets/src/mage/sets/invasion/SpinalEmbrace.java b/Mage.Sets/src/mage/sets/invasion/SpinalEmbrace.java index a6e9a88576c..70e0f08f079 100644 --- a/Mage.Sets/src/mage/sets/invasion/SpinalEmbrace.java +++ b/Mage.Sets/src/mage/sets/invasion/SpinalEmbrace.java @@ -110,7 +110,7 @@ class SpinalEmbraceEffect extends ContinuousRuleModifiyingEffectImpl { @Override public boolean applies(GameEvent event, Ability source, Game game) { if (event.getType().equals(GameEvent.EventType.CAST_SPELL) && event.getSourceId().equals(source.getSourceId())) { - return !game.getTurn().getPhaseType().equals(TurnPhase.COMBAT); + return !TurnPhase.COMBAT.equals(game.getTurn().getPhaseType()); } return false; } diff --git a/Mage.Sets/src/mage/sets/seventhedition/RelentlessAssault.java b/Mage.Sets/src/mage/sets/seventhedition/RelentlessAssault.java index 2d0a90d4d8e..034f48f18be 100644 --- a/Mage.Sets/src/mage/sets/seventhedition/RelentlessAssault.java +++ b/Mage.Sets/src/mage/sets/seventhedition/RelentlessAssault.java @@ -125,7 +125,7 @@ class RelentlessAssaultAddPhasesEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { // 15.07.2006 If it's somehow not a main phase when Fury of the Horde resolves, all it does is untap all creatures that attacked that turn. No new phases are created. - if (game.getTurn().getPhaseType().equals(TurnPhase.PRECOMBAT_MAIN) || game.getTurn().getPhaseType().equals(TurnPhase.POSTCOMBAT_MAIN)) { + if (TurnPhase.PRECOMBAT_MAIN.equals(game.getTurn().getPhaseType()) || TurnPhase.POSTCOMBAT_MAIN.equals(game.getTurn().getPhaseType())) { // we can't add two turn modes at once, will add additional post combat on delayed trigger resolution TurnMod combat = new TurnMod(source.getControllerId(), TurnPhase.COMBAT, TurnPhase.POSTCOMBAT_MAIN, false); game.getState().getTurnMods().add(combat); diff --git a/Mage/src/mage/abilities/condition/common/IsPhaseCondition.java b/Mage/src/mage/abilities/condition/common/IsPhaseCondition.java index 3739a855f2c..ea38137346c 100644 --- a/Mage/src/mage/abilities/condition/common/IsPhaseCondition.java +++ b/Mage/src/mage/abilities/condition/common/IsPhaseCondition.java @@ -47,7 +47,7 @@ public class IsPhaseCondition implements Condition { @Override public boolean apply(Game game, Ability source) { - return game.getTurn().getPhaseType().equals(turnPhase); + return turnPhase.equals(game.getTurn().getPhaseType()); } @Override