From 8e8ee4bb5c44503c4c9ecf8aa4138afbcc7b5c9d Mon Sep 17 00:00:00 2001 From: Sloth Date: Mon, 24 Jun 2013 14:58:04 +0000 Subject: [PATCH] - Fixed prompt of "At the beginning of your upkeep, sacrifice" keywords. --- src/main/java/forge/game/phase/Upkeep.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/forge/game/phase/Upkeep.java b/src/main/java/forge/game/phase/Upkeep.java index c1bccce22f4..cccb26403a9 100644 --- a/src/main/java/forge/game/phase/Upkeep.java +++ b/src/main/java/forge/game/phase/Upkeep.java @@ -252,21 +252,21 @@ public class Upkeep extends Phase { if (ability.startsWith("At the beginning of your upkeep, sacrifice")) { final String[] k = ability.split(" pay "); cost = k[1].toString(); - sb.append("Sacrifice upkeep for ").append(c).append("\n"); + sb.append("Sacrifice upkeep for " + c); } if (ability.startsWith("Cumulative upkeep")) { final String[] k = ability.split(":"); c.addCounter(CounterType.AGE, 1, true); cost = CardFactoryUtil.multiplyCost(k[1], c.getCounters(CounterType.AGE)); - sb.append("Cumulative upkeep for ").append(c).append("\n"); + sb.append("Cumulative upkeep for " + c); } final Cost upkeepCost = new Cost(cost, true); final Ability upkeepAbility = new Ability(c, ManaCost.ZERO) { @Override public void resolve() { - boolean isPaid = controller.getController().payManaOptional(c, upkeepCost, this, "Cumulative upkeep for " + c, ManaPaymentPurpose.CumulativeUpkeep); + boolean isPaid = controller.getController().payManaOptional(c, upkeepCost, this, sb.toString(), ManaPaymentPurpose.CumulativeUpkeep); final HashMap runParams = new HashMap(); runParams.put("CumulativeUpkeepPaid", (Boolean) isPaid); runParams.put("Card", this.getSourceCard()); @@ -275,6 +275,7 @@ public class Upkeep extends Phase { game.getAction().sacrifice(c, null); } }; + sb.append("\n"); upkeepAbility.setActivatingPlayer(controller); upkeepAbility.setStackDescription(sb.toString()); upkeepAbility.setDescription(sb.toString());