Merge branch 'NewMaster' into 'master'

[Mobile] update PlayEffect

See merge request core-developers/forge!6467

forge-game/src/main/java/forge/game/ability/effects/PlayEffect.java

@@ -254,7 +254,8 @@ public class PlayEffect extends SpellAbilityEffect {
             if (sa.hasParam("ShowCardToActivator")) {
                 game.getAction().revealTo(tgtCard, activator);
             }
-
+            if (singleOption && sa.getTargetCard() == null)
+                sa.setPlayEffectCard(tgtCard);// show card to play rather than showing the source card
             if (singleOption && !controller.getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblDoYouWantPlayCard", CardTranslation.getTranslatedName(tgtCard.getName())))) {
                 if (wasFaceDown) {
                     tgtCard.turnFaceDownNoUpdate();

forge-game/src/main/java/forge/game/card/CardView.java

@@ -477,7 +477,6 @@ public class CardView extends GameEntityView {
     void updateNamedCard2(Card c) {
         set(TrackableProperty.NamedCard2, c.getNamedCard2());
     }
-
     public boolean mayPlayerLook(PlayerView pv) {
         TrackableCollection<PlayerView> col = get(TrackableProperty.PlayerMayLook);
         // TODO don't use contains as it only queries the backing HashSet which is problematic for netplay because of unsynchronized player ids

forge-game/src/main/java/forge/game/spellability/SpellAbility.java

@@ -113,6 +113,7 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
     private ManaCost multiKickerManaCost;
     private Player activatingPlayer;
     private Player targetingPlayer;
+    private Card playEffectCard;
     private Pair<Long, Player> controlledByPlayer;
     private ManaCostBeingPaid manaCostBeingPaid;
     private boolean spentPhyrexian = false;
@@ -1788,6 +1789,12 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
         targetChosen.add(card);
         setStackDescription(getHostCard().getName() + " - targeting " + card);
     }
+    public void setPlayEffectCard(final Card card) {
+        playEffectCard = card;
+    }
+    public Card getPlayEffectCard() {
+        return playEffectCard;
+    }
 
     /**
      * <p>