PlayEffect should only forget if the cast was successful

This commit is contained in:
Hanmac
2016-07-19 06:29:37 +00:00
parent 49c8b987e5
commit 9ca43bcb17

View File

@@ -163,9 +163,6 @@ public class PlayEffect extends SpellAbilityEffect {
if (wasFaceDown) { if (wasFaceDown) {
tgtCard.updateStateForView(); tgtCard.updateStateForView();
} }
if (sa.hasParam("ForgetRemembered")) {
source.clearRemembered();
}
final Card original = tgtCard; final Card original = tgtCard;
if (sa.hasParam("CopyCard")) { if (sa.hasParam("CopyCard")) {
@@ -232,9 +229,19 @@ public class PlayEffect extends SpellAbilityEffect {
tgtSA.getTargetRestrictions().setMandatory(true); tgtSA.getTargetRestrictions().setMandatory(true);
} }
remember &= controller.getController().playSaFromPlayEffect(tgtSA); if (controller.getController().playSaFromPlayEffect(tgtSA)) {
if (remember) { if (remember) {
source.addRemembered(tgtSA.getHostCard()); source.addRemembered(tgtSA.getHostCard());
}
//Forgot only of playing was successful
if (sa.hasParam("ForgetRemembered")) {
source.clearRemembered();
}
if (sa.hasParam("ForgetTargetRemembered")) {
source.removeRemembered(tgtCard);
}
} }
amount--; amount--;