external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 10:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'garth' into 'master'

Browse Source 
Cascade fix for Garth

See merge request core-developers/forge!6013
This commit is contained in:
Michael Kamensky
2022-01-05 04:34:17 +00:00
parent e27307e217 cca65c6661
commit 886bc51db7
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/ability/effects/PlayEffect.java
View File

@@ -149,6 +149,8 @@ public class PlayEffect extends SpellAbilityEffect {
String name = source.getChosenName(); String name = source.getChosenName();
if (name.trim().isEmpty()) return; if (name.trim().isEmpty()) return;
Card card = Card.fromPaperCard(StaticData.instance().getCommonCards().getUniqueByName(name), controller); Card card = Card.fromPaperCard(StaticData.instance().getCommonCards().getUniqueByName(name), controller);
// so it gets added to stack
card.setCopiedPermanent(card);
card.setToken(true); card.setToken(true);
tgtCards = new CardCollection(); tgtCards = new CardCollection();
tgtCards.add(card); tgtCards.add(card);

2
forge-game/src/main/java/forge/game/zone/Zone.java
View File

@@ -119,7 +119,7 @@ public class Zone implements java.io.Serializable, Iterable<Card> {
c.setTapped(false); 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. // But Effects/Emblems count as Tokens too, so allow Command too.
if ((zoneType == ZoneType.Battlefield || !c.isToken()) || (zoneType == ZoneType.Stack && c.getCopiedPermanent() != null)) { if ((zoneType == ZoneType.Battlefield || !c.isToken()) || (zoneType == ZoneType.Stack && c.getCopiedPermanent() != null)) {
c.setZone(this); c.setZone(this);

1
forge-gui/src/main/java/forge/player/HumanPlay.java
View File

@@ -139,7 +139,6 @@ public class HumanPlay {
* @return an ArrayList<SpellAbility>. * @return an ArrayList<SpellAbility>.
*/ */
static SpellAbility chooseOptionalAdditionalCosts(Player p, final SpellAbility original) { static SpellAbility chooseOptionalAdditionalCosts(Player p, final SpellAbility original) {
PlayerController c = p.getController(); PlayerController c = p.getController();
// choose alternative additional cost // choose alternative additional cost