From 15d3a1ffa710685f33af0502f13d171c4d3b256d Mon Sep 17 00:00:00 2001 From: Sol Date: Wed, 22 Aug 2012 02:31:30 +0000 Subject: [PATCH] - For triggers with no Valid Target Candidates, just cancel them instead of asking for targets. --- src/main/java/forge/card/spellability/TargetSelection.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/forge/card/spellability/TargetSelection.java b/src/main/java/forge/card/spellability/TargetSelection.java index 16018cc10c6..e1f9e89a847 100644 --- a/src/main/java/forge/card/spellability/TargetSelection.java +++ b/src/main/java/forge/card/spellability/TargetSelection.java @@ -213,6 +213,13 @@ public class TargetSelection { return this.subSelection.chooseTargets(); } } + + if (!this.target.hasCandidates(this.ability, true)) { + // Cancel ability if there aren't any valid Candidates + this.bCancel = true; + this.req.finishedTargeting(); + return false; + } this.chooseValidInput();