From cca65c6661a1a4f81c376b797647207d9f6e4d4d Mon Sep 17 00:00:00 2001 From: tool4EvEr Date: Tue, 4 Jan 2022 23:08:04 +0100 Subject: [PATCH] Cascade fix for Garth --- .../src/main/java/forge/game/ability/effects/PlayEffect.java | 2 ++ forge-game/src/main/java/forge/game/zone/Zone.java | 2 +- forge-gui/src/main/java/forge/player/HumanPlay.java | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/forge-game/src/main/java/forge/game/ability/effects/PlayEffect.java b/forge-game/src/main/java/forge/game/ability/effects/PlayEffect.java index 18aae6692eb..fe08d19d3b5 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/PlayEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/PlayEffect.java @@ -149,6 +149,8 @@ public class PlayEffect extends SpellAbilityEffect { String name = source.getChosenName(); if (name.trim().isEmpty()) return; Card card = Card.fromPaperCard(StaticData.instance().getCommonCards().getUniqueByName(name), controller); + // so it gets added to stack + card.setCopiedPermanent(card); card.setToken(true); tgtCards = new CardCollection(); tgtCards.add(card); diff --git a/forge-game/src/main/java/forge/game/zone/Zone.java b/forge-game/src/main/java/forge/game/zone/Zone.java index a380f6b8b1a..b60850a018d 100644 --- a/forge-game/src/main/java/forge/game/zone/Zone.java +++ b/forge-game/src/main/java/forge/game/zone/Zone.java @@ -119,7 +119,7 @@ public class Zone implements java.io.Serializable, Iterable { c.setTapped(false); } - // Do not add Tokens to other zones than the battlefield. (unless it's a copy of a card 706.12) + // Do not add Tokens to other zones than the battlefield. (unless it's a copy of a card 707.12) // But Effects/Emblems count as Tokens too, so allow Command too. if ((zoneType == ZoneType.Battlefield || !c.isToken()) || (zoneType == ZoneType.Stack && c.getCopiedPermanent() != null)) { c.setZone(this); diff --git a/forge-gui/src/main/java/forge/player/HumanPlay.java b/forge-gui/src/main/java/forge/player/HumanPlay.java index f85ed88a6d0..ab143a35e4f 100644 --- a/forge-gui/src/main/java/forge/player/HumanPlay.java +++ b/forge-gui/src/main/java/forge/player/HumanPlay.java @@ -139,7 +139,6 @@ public class HumanPlay { * @return an ArrayList. */ static SpellAbility chooseOptionalAdditionalCosts(Player p, final SpellAbility original) { - PlayerController c = p.getController(); // choose alternative additional cost