From 472829f47a968d55655d9d4acb30034361b34114 Mon Sep 17 00:00:00 2001 From: slapshot5 Date: Tue, 11 Oct 2011 04:37:49 +0000 Subject: [PATCH] fix RememberDiscarded when Mode$ Hand --- src/main/java/forge/Player.java | 3 ++- .../card/abilityFactory/AbilityFactory_ZoneAffecting.java | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/forge/Player.java b/src/main/java/forge/Player.java index 4f3b58f11cd..b39306cae4d 100644 --- a/src/main/java/forge/Player.java +++ b/src/main/java/forge/Player.java @@ -1061,9 +1061,10 @@ public abstract class Player extends GameEntity { * * @param sa a {@link forge.card.spellability.SpellAbility} object. */ - public void discardHand(SpellAbility sa) { + public CardList discardHand(SpellAbility sa) { CardList list = this.getCardsIn(Zone.Hand); discardRandom(list.size(), sa); + return list; } /** diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactory_ZoneAffecting.java b/src/main/java/forge/card/abilityFactory/AbilityFactory_ZoneAffecting.java index fa6f9f8c7e9..2c4a95bb3a9 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactory_ZoneAffecting.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactory_ZoneAffecting.java @@ -936,7 +936,12 @@ public class AbilityFactory_ZoneAffecting { for (Player p : tgtPlayers) { if (tgt == null || p.canTarget(sa)) { if (mode.equals("Hand")) { - p.discardHand(sa); + CardList list = p.discardHand(sa); + if (params.containsKey("RememberDiscarded")) { + for (Card c : list) { + source.addRemembered(c); + } + } continue; }