From 9ca43bcb1745c4a6c232d9cf7e116bc48cd7a90f Mon Sep 17 00:00:00 2001 From: Hanmac Date: Tue, 19 Jul 2016 06:29:37 +0000 Subject: [PATCH] PlayEffect should only forget if the cast was successful --- .../game/ability/effects/PlayEffect.java | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 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 8fc658445a2..d23a4a6ec76 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 @@ -163,9 +163,6 @@ public class PlayEffect extends SpellAbilityEffect { if (wasFaceDown) { tgtCard.updateStateForView(); } - if (sa.hasParam("ForgetRemembered")) { - source.clearRemembered(); - } final Card original = tgtCard; if (sa.hasParam("CopyCard")) { @@ -232,9 +229,19 @@ public class PlayEffect extends SpellAbilityEffect { tgtSA.getTargetRestrictions().setMandatory(true); } - remember &= controller.getController().playSaFromPlayEffect(tgtSA); - if (remember) { - source.addRemembered(tgtSA.getHostCard()); + if (controller.getController().playSaFromPlayEffect(tgtSA)) { + if (remember) { + source.addRemembered(tgtSA.getHostCard()); + } + + //Forgot only of playing was successful + if (sa.hasParam("ForgetRemembered")) { + source.clearRemembered(); + } + + if (sa.hasParam("ForgetTargetRemembered")) { + source.removeRemembered(tgtCard); + } } amount--;