- Switch propaganda fix to EmptySa which fills in activating player.

This commit is contained in:
Sol
2014-03-06 03:17:42 +00:00
parent f5a8b2706d
commit 8e7dd1a4ac

View File

@@ -988,17 +988,7 @@ public class CombatUtil {
// Not a great solution, but prevents a crash by passing a fake SA for Propaganda payments // 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 // If there's a better way of handling this somewhere deeper in the code, feel free to remove
SpellAbility fakeSA = new SpellAbility(c, attackCost) { SpellAbility fakeSA = new SpellAbility.EmptySa(c, c.getController());
@Override
public boolean canPlay() {
return false;
}
@Override
public void resolve() {
}
};
boolean isFree = attackCost.getTotalMana().isZero() && attackCost.isOnlyManaCost(); // true if needless to pay 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); return isFree || c.getController().getController().payManaOptional(c, attackCost, fakeSA, "Pay additional cost to declare " + c + " an attacker", ManaPaymentPurpose.DeclareAttacker);