From fd604e3ce6e296eaff2f63219c19a541482faf63 Mon Sep 17 00:00:00 2001 From: tool4EvEr Date: Sun, 22 Jan 2023 10:49:34 +0100 Subject: [PATCH] Increase SBA check precision --- forge-game/src/main/java/forge/game/GameAction.java | 6 ++++++ .../forge/game/ability/effects/CopySpellAbilityEffect.java | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/forge-game/src/main/java/forge/game/GameAction.java b/forge-game/src/main/java/forge/game/GameAction.java index 2f82bd69aab..e08f05ad59d 100644 --- a/forge-game/src/main/java/forge/game/GameAction.java +++ b/forge-game/src/main/java/forge/game/GameAction.java @@ -1641,6 +1641,12 @@ public class GameAction { boolean checkAgain = false; if (c.isRealToken()) { final Zone zoneFrom = game.getZoneOf(c); + + // card copies are allowed on the stack + if (zoneFrom.is(ZoneType.Stack) && c.getCopiedPermanent() != null) { + return false; + } + if (!zoneFrom.is(ZoneType.Battlefield)) { zoneFrom.remove(c); checkAgain = true; diff --git a/forge-game/src/main/java/forge/game/ability/effects/CopySpellAbilityEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CopySpellAbilityEffect.java index 602bf0f185d..b5fe6b70b30 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/CopySpellAbilityEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/CopySpellAbilityEffect.java @@ -160,7 +160,6 @@ public class CopySpellAbilityEffect extends SpellAbilityEffect { copies.add(copy); } } - } } else { for (int i = 0; i < amount; i++) { @@ -238,7 +237,7 @@ public class CopySpellAbilityEffect extends SpellAbilityEffect { card.addRemembered(copies); } } - } // end resolve + } private void resetFirstTargetOnCopy(SpellAbility copy, GameEntity obj, SpellAbility targetedSA) { copy.resetFirstTarget(obj, targetedSA);