From af12ffc010d08389c24fa5ac7901a2e3f5a921d2 Mon Sep 17 00:00:00 2001 From: Sloth Date: Thu, 21 Jun 2012 18:32:14 +0000 Subject: [PATCH] - Fixed The Abyss and similar cards. --- src/main/java/forge/card/spellability/SpellAbility.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/forge/card/spellability/SpellAbility.java b/src/main/java/forge/card/spellability/SpellAbility.java index d24abfaf4b1..f364a034c67 100644 --- a/src/main/java/forge/card/spellability/SpellAbility.java +++ b/src/main/java/forge/card/spellability/SpellAbility.java @@ -1636,9 +1636,14 @@ public abstract class SpellAbility { * @return a boolean. */ public final boolean canTarget(final GameEntity entity) { + if (this.getTarget() == null) { + if (entity.canBeTargetedBy(this)) { + return true; + } + return false; + } if (entity.isValid(this.getTarget().getValidTgts(), this.getActivatingPlayer(), this.getSourceCard()) - && (this.getTarget() == null || !this.getTarget().isUniqueTargets() - || !TargetSelection.getUniqueTargets(this).contains(entity)) + && (!this.getTarget().isUniqueTargets() || !TargetSelection.getUniqueTargets(this).contains(entity)) && entity.canBeTargetedBy(this)) { return true; }