From e072e2e6df25679cafd786670f45ee1844a8a94d Mon Sep 17 00:00:00 2001 From: Sol Date: Wed, 14 Oct 2015 00:00:06 +0000 Subject: [PATCH] - Fix Sonic Burst being castable when it's the only card in your hand. --- forge-game/src/main/java/forge/game/cost/CostDiscard.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/forge-game/src/main/java/forge/game/cost/CostDiscard.java b/forge-game/src/main/java/forge/game/cost/CostDiscard.java index 9fa3989f687..a816adec22d 100644 --- a/forge-game/src/main/java/forge/game/cost/CostDiscard.java +++ b/forge-game/src/main/java/forge/game/cost/CostDiscard.java @@ -134,7 +134,13 @@ public class CostDiscard extends CostPartWithList { } return false; } - if ((amount != null) && (amount > handList.size())) { + int adjustment = 0; + if (source.isInZone(ZoneType.Hand) && activator.equals(source.getOwner())) { + // If this card is in my hand, I can't use it to pay for it's own cost + adjustment = 1; + } + + if ((amount != null) && (amount > handList.size() - adjustment)) { // not enough cards in hand to pay return false; }