From 12be76899a7e68ad0ff394d024128e96e2c72f53 Mon Sep 17 00:00:00 2001 From: tool4EvEr Date: Sun, 4 Jul 2021 13:41:24 +0200 Subject: [PATCH] Fix amount for X spells --- forge-game/src/main/java/forge/game/cost/CostAdjustment.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/forge-game/src/main/java/forge/game/cost/CostAdjustment.java b/forge-game/src/main/java/forge/game/cost/CostAdjustment.java index 0e8f733c974..41029d79e66 100644 --- a/forge-game/src/main/java/forge/game/cost/CostAdjustment.java +++ b/forge-game/src/main/java/forge/game/cost/CostAdjustment.java @@ -138,7 +138,7 @@ public class CostAdjustment { count = Integer.parseInt(amount); } else { if (st.hasParam("AffectedAmount")) { - count = AbilityUtils.calculateAmount(hostCard, amount, sa); + count = AbilityUtils.calculateAmount(card, st.hasSVar(amount) ? st.getSVar(amount) : amount, sa); } else { count = AbilityUtils.calculateAmount(hostCard, amount, st); } @@ -310,7 +310,6 @@ public class CostAdjustment { } private static void adjustCostByEmerge(final ManaCostBeingPaid cost, final SpellAbility sa) { - Card toSac = null; CardCollectionView canEmerge = CardLists.filter(sa.getActivatingPlayer().getCreaturesInPlay(), CardPredicates.canBeSacrificedBy(sa));