From 8e7dd1a4acc2e6575898f9d0f6f46a1478569557 Mon Sep 17 00:00:00 2001 From: Sol Date: Thu, 6 Mar 2014 03:17:42 +0000 Subject: [PATCH] - Switch propaganda fix to EmptySa which fills in activating player. --- .../src/main/java/forge/game/combat/CombatUtil.java | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/forge-game/src/main/java/forge/game/combat/CombatUtil.java b/forge-game/src/main/java/forge/game/combat/CombatUtil.java index f22e51f1576..57924c019df 100644 --- a/forge-game/src/main/java/forge/game/combat/CombatUtil.java +++ b/forge-game/src/main/java/forge/game/combat/CombatUtil.java @@ -988,17 +988,7 @@ public class CombatUtil { // Not a great solution, but prevents a crash by passing a fake SA for Propaganda payments // If there's a better way of handling this somewhere deeper in the code, feel free to remove - SpellAbility fakeSA = new SpellAbility(c, attackCost) { - @Override - public boolean canPlay() { - return false; - } - - @Override - public void resolve() { - - } - }; + SpellAbility fakeSA = new SpellAbility.EmptySa(c, c.getController()); boolean isFree = attackCost.getTotalMana().isZero() && attackCost.isOnlyManaCost(); // true if needless to pay return isFree || c.getController().getController().payManaOptional(c, attackCost, fakeSA, "Pay additional cost to declare " + c + " an attacker", ManaPaymentPurpose.DeclareAttacker);