From 191a8e4e43cef831cd08c92f2856e9475490fa44 Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Sat, 6 Jul 2013 23:16:34 +0000 Subject: [PATCH] This restores Valacut - Scapeshift combo Have to figure out how this influences on OpeningHandEffects --- .../java/forge/card/spellability/HumanPlaySpellAbility.java | 1 - src/main/java/forge/game/event/GameEventTurnPhase.java | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/forge/card/spellability/HumanPlaySpellAbility.java b/src/main/java/forge/card/spellability/HumanPlaySpellAbility.java index 9df7b5b2169..4e7f1459f05 100644 --- a/src/main/java/forge/card/spellability/HumanPlaySpellAbility.java +++ b/src/main/java/forge/card/spellability/HumanPlaySpellAbility.java @@ -82,7 +82,6 @@ public class HumanPlaySpellAbility { if (isFree || this.payment.isFullyPaid()) { if (skipStack) { - game.getStack().unfreezeStack(); AbilityUtils.resolve(this.ability); } else { this.enusureAbilityHasDescription(this.ability); diff --git a/src/main/java/forge/game/event/GameEventTurnPhase.java b/src/main/java/forge/game/event/GameEventTurnPhase.java index c67329a2538..2272029fdd3 100644 --- a/src/main/java/forge/game/event/GameEventTurnPhase.java +++ b/src/main/java/forge/game/event/GameEventTurnPhase.java @@ -28,6 +28,7 @@ public class GameEventTurnPhase extends GameEvent { @Override public String toString() { - return String.format("%s turn, %s%s phase", Lang.getPossesive(playerTurn.getName()), phaseDesc, phase.nameForUi ); + String playerName = Lang.getPossesive(playerTurn.getName()); + return String.format("%s turn, %s%s phase", playerName, phaseDesc, phase.nameForUi ); } }