From 6364cbb746c091db321ad5d8fbb77d58bfaa6113 Mon Sep 17 00:00:00 2001
From: moomarc <moomarc@cardforge.org>
Date: Fri, 16 Mar 2012 12:15:11 +0000
Subject: [PATCH] Small fix for RememberedPlayerCtrl restriction.

---
 src/main/java/forge/Card.java | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java
index 3c4f606d755..eefbaf1a86c 100644
--- a/src/main/java/forge/Card.java
+++ b/src/main/java/forge/Card.java
@@ -6766,11 +6766,23 @@ public class Card extends GameEntity implements Comparable<Card> {
             } else { // source not enchanting a player
                 return false;
             }
-        } else if (property.equals("RememberedPlayerCtrl")) {
-            final Object o = source.getRemembered();
-            if (o instanceof Player) {
-                if (!this.getController().isPlayer((Player) o)) {
-                  return false;
+        } else if (property.startsWith("RememberedPlayerCtrl")) {
+            if (source.getRemembered().isEmpty()) {
+                final Card newCard = AllZoneUtil.getCardState(source);
+                for (final Object o : newCard.getRemembered()) {
+                    if (o instanceof Player) {
+                        if (!this.getController().isPlayer((Player) o)) {
+                            return false;
+                          }
+                    }
+                }
+            }
+
+            for (final Object o : source.getRemembered()) {
+                if (o instanceof Player) {
+                    if (!this.getController().isPlayer((Player) o)) {
+                        return false;
+                      }
                 }
             }
         } else if (property.startsWith("YouOwn")) {