Merge branch 'garth' into 'master'

Cascade fix for Garth

See merge request core-developers/forge!6013

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);

forge-game/src/main/java/forge/game/zone/Zone.java

@@ -119,7 +119,7 @@ public class Zone implements java.io.Serializable, Iterable<Card> {
             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);

forge-gui/src/main/java/forge/player/HumanPlay.java

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