From 147793ae9c3be832ca76ae5522c371bda5425b5c Mon Sep 17 00:00:00 2001
From: moomarc <moomarc@cardforge.org>
Date: Wed, 19 Sep 2012 07:49:38 +0000
Subject: [PATCH] - RtR: Added Search the City

---
 .../card/abilityfactory/AbilityFactoryChangeZone.java     | 8 ++++++++
 .../card/abilityfactory/AbilityFactoryZoneAffecting.java  | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java
index b15c157ac7b..e5625f42a6c 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java
@@ -950,6 +950,7 @@ public final class AbilityFactoryChangeZone {
         }
 
         final String remember = params.get("RememberChanged");
+        final String forget = params.get("ForgetChanged");
         final String imprint = params.get("Imprint");
 
         if (params.containsKey("Unimprint")) {
@@ -1034,6 +1035,9 @@ public final class AbilityFactoryChangeZone {
                 if (remember != null) {
                     card.addRemembered(movedCard);
                 }
+                if (forget != null) {
+                    sa.getSourceCard().getRemembered().remove(movedCard);
+                }
                 // for imprinted since this doesn't use Target
                 if (imprint != null) {
                     card.addImprinted(movedCard);
@@ -1114,6 +1118,7 @@ public final class AbilityFactoryChangeZone {
         final ZoneType destination = ZoneType.smartValueOf(params.get("Destination"));
         final CardList fetched = new CardList();
         final String remember = params.get("RememberChanged");
+        final String forget = params.get("ForgetChanged");
         final String imprint = params.get("Imprint");
 
         if (params.containsKey("Unimprint")) {
@@ -1287,6 +1292,9 @@ public final class AbilityFactoryChangeZone {
             if (remember != null) {
                 card.addRemembered(newCard);
             }
+            if (forget != null) {
+                sa.getSourceCard().getRemembered().remove(movedCard);
+            }
             // for imprinted since this doesn't use Target
             if (imprint != null) {
                 card.addImprinted(newCard);
diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryZoneAffecting.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryZoneAffecting.java
index 466cad9a387..664942f1661 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryZoneAffecting.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryZoneAffecting.java
@@ -1053,6 +1053,10 @@ public class AbilityFactoryZoneAffecting {
         final int numCards = AbilityFactory.calculateAmount(sa.getSourceCard(), params.get("NumCards"), sa);
         final boolean bottom = params.containsKey("FromBottom");
 
+        if (params.containsKey("ForgetOtherRemembered")) {
+            source.clearRemembered();
+        }
+
         ArrayList<Player> tgtPlayers;
 
         final Target tgt = sa.getTarget();