From f7f1faffed91ca8ed6212a74a0e36fae1ac42f08 Mon Sep 17 00:00:00 2001 From: tool4EvEr Date: Fri, 24 Jun 2022 11:49:51 +0200 Subject: [PATCH] only reset castFaceDown when making a full spell copy --- forge-game/src/main/java/forge/game/card/CardFactory.java | 6 ++++++ .../src/main/java/forge/game/spellability/SpellAbility.java | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/forge-game/src/main/java/forge/game/card/CardFactory.java b/forge-game/src/main/java/forge/game/card/CardFactory.java index 062c48892ca..bd6c3dfe073 100644 --- a/forge-game/src/main/java/forge/game/card/CardFactory.java +++ b/forge-game/src/main/java/forge/game/card/CardFactory.java @@ -209,6 +209,12 @@ public class CardFactory { // 707.10b copySA.setOriginalAbility(targetSA); + // Copied spell is not cast face down + if (copySA instanceof Spell) { + Spell spell = (Spell) copySA; + spell.setCastFaceDown(false); + } + if (targetSA.usesTargeting()) { // do for SubAbilities too? copySA.setTargets(targetSA.getTargets().clone()); diff --git a/forge-game/src/main/java/forge/game/spellability/SpellAbility.java b/forge-game/src/main/java/forge/game/spellability/SpellAbility.java index a19859c37c4..fff1c723c13 100644 --- a/forge-game/src/main/java/forge/game/spellability/SpellAbility.java +++ b/forge-game/src/main/java/forge/game/spellability/SpellAbility.java @@ -1096,12 +1096,6 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit // always set this to false, it is only set in CopyEffect clone.mayChooseNewTargets = false; - // Copied spell is not cast face down - if (clone instanceof Spell) { - Spell spell = (Spell) clone; - spell.setCastFaceDown(false); - } - clone.triggeringObjects = AbilityKey.newMap(this.triggeringObjects); clone.setPayCosts(getPayCosts().copy());