From d3b5c51428e4172b187ca7dad1e25a31a46b41a5 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Fri, 16 Jul 2021 13:08:24 -0400 Subject: [PATCH] fixed test failures (fixes #8016) --- Mage.Sets/src/mage/cards/s/SpareDagger.java | 2 +- Mage.Sets/src/mage/cards/t/TrickstersTalisman.java | 2 +- .../common/BeginningOfEndStepTriggeredAbility.java | 3 --- .../continuous/GainAbilityWithAttachmentEffect.java | 10 ++++++++-- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Mage.Sets/src/mage/cards/s/SpareDagger.java b/Mage.Sets/src/mage/cards/s/SpareDagger.java index eb77c8d121f..2fef867de9a 100644 --- a/Mage.Sets/src/mage/cards/s/SpareDagger.java +++ b/Mage.Sets/src/mage/cards/s/SpareDagger.java @@ -53,7 +53,7 @@ class SpareDaggerEffect extends GainAbilityWithAttachmentEffect { SpareDaggerEffect() { super("and has \"Whenever this creature attacks, you may sacrifice {this}. " + "When you do, this creature deals 1 damage to any target.\"", - (Effect) null, null, new SacrificeAttachmentCost(), null); + (Effect) null, null, new SacrificeAttachmentCost()); } private SpareDaggerEffect(final SpareDaggerEffect effect) { diff --git a/Mage.Sets/src/mage/cards/t/TrickstersTalisman.java b/Mage.Sets/src/mage/cards/t/TrickstersTalisman.java index 8213c858f8a..50b169b5338 100644 --- a/Mage.Sets/src/mage/cards/t/TrickstersTalisman.java +++ b/Mage.Sets/src/mage/cards/t/TrickstersTalisman.java @@ -51,7 +51,7 @@ class TrickstersTalismanEffect extends GainAbilityWithAttachmentEffect { TrickstersTalismanEffect() { super("and has \"Whenever this creature deals combat damage to a player, " + "you may sacrifice {this}. If you do, create a token that's a copy of this creature.\"", - (Effect) null, null, new SacrificeAttachmentCost(), null); + (Effect) null, null, new SacrificeAttachmentCost()); } private TrickstersTalismanEffect(final TrickstersTalismanEffect effect) { diff --git a/Mage/src/main/java/mage/abilities/common/BeginningOfEndStepTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BeginningOfEndStepTriggeredAbility.java index e11b5b6b29c..fa0b18c43df 100644 --- a/Mage/src/main/java/mage/abilities/common/BeginningOfEndStepTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/BeginningOfEndStepTriggeredAbility.java @@ -134,9 +134,6 @@ public class BeginningOfEndStepTriggeredAbility extends TriggeredAbilityImpl { } return clauseText + ", "; } - System.out.println("=================="); - System.out.println(clauseText); - System.out.println("=================="); return "if " + clauseText + ", "; } } diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityWithAttachmentEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityWithAttachmentEffect.java index 631195bc2cf..4b5262f6234 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityWithAttachmentEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainAbilityWithAttachmentEffect.java @@ -19,7 +19,7 @@ import mage.target.Target; import mage.target.Targets; import mage.target.targetpointer.FixedTarget; -import java.util.Arrays; +import java.util.Objects; /** * @author TheElk801 @@ -39,8 +39,14 @@ public class GainAbilityWithAttachmentEffect extends ContinuousEffectImpl { super(Duration.WhileOnBattlefield, Layer.AbilityAddingRemovingEffects_6, SubLayer.NA, Outcome.AddAbility); this.staticText = rule; this.effects.addAll(effects); + this.effects.removeIf(Objects::isNull); this.targets.addAll(targets); - this.costs.addAll(Arrays.asList(costs)); + this.targets.removeIf(Objects::isNull); + for (Cost cost : costs) { + if (cost != null) { + this.costs.add(cost); + } + } this.useAttachedCost = attachedCost; this.generateGainAbilityDependencies(makeAbility(null, null), null); }