From 011f0f167f2a01f9d89d6a15564320cdf9f7e9e7 Mon Sep 17 00:00:00 2001
From: moomarc <moomarc@cardforge.org>
Date: Wed, 14 Mar 2012 09:47:08 +0000
Subject: [PATCH] Added Oriss, Samite Guardian Added RememberedPlayerCtrl to
 isValid

---
 .gitattributes                              |  1 +
 res/cardsfolder/o/oriss_samite_guardian.txt | 15 +++++++++++++++
 src/main/java/forge/Card.java               |  7 +++++++
 3 files changed, 23 insertions(+)
 create mode 100644 res/cardsfolder/o/oriss_samite_guardian.txt

diff --git a/.gitattributes b/.gitattributes
index 4f6969e4a0b..a0f9960bcbf 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -6276,6 +6276,7 @@ res/cardsfolder/o/orims_cure.txt -text
 res/cardsfolder/o/orims_prayer.txt svneol=native#text/plain
 res/cardsfolder/o/orims_thunder.txt svneol=native#text/plain
 res/cardsfolder/o/orims_touch.txt -text svneol=unset#text/plain
+res/cardsfolder/o/oriss_samite_guardian.txt -text
 res/cardsfolder/o/ornate_kanzashi.txt -text
 res/cardsfolder/o/ornithopter.txt svneol=native#text/plain
 res/cardsfolder/o/orochi_eggwatcher_shidako_broodmistress.txt -text
diff --git a/res/cardsfolder/o/oriss_samite_guardian.txt b/res/cardsfolder/o/oriss_samite_guardian.txt
new file mode 100644
index 00000000000..1b144c04135
--- /dev/null
+++ b/res/cardsfolder/o/oriss_samite_guardian.txt
@@ -0,0 +1,15 @@
+Name:Oriss, Samite Guardian
+ManaCost:1 W W
+Types:Legendary Creature Human Cleric
+Text:no text
+PT:1/3
+A:AB$ Pump | Cost$ T | KW$ HIDDEN Prevent all damage that would be dealt to CARDNAME. | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Prevent all damage that would be dealt to target creature this turn.
+A:AB$ Effect | Cost$ Discard<1/Card.namedOriss, Samite Guardian> | CostDesc$ Grandeur - Discard another card named CARDNAME:| Name$ Oriss Effect | IsCurse$ True | StaticAbilities$ CantBeCast,CantAttack | ValidTgts$ Player | RememberObjects$ Targeted | AILogic$ BeginningOfOppTurn | SpellDescription$ Target player can't cast spells this turn, and creatures that player controls can't attack this turn.
+SVar:CantBeCast:Mode$ CantBeCast | ValidCard$ Card | Caster$ Player.IsRemembered | Description$ Targeted player can't cast spells this turn.
+SVar:CantAttack:Mode$ Continuous | Affected$ Creature.RememberedPlayerCtrl | AddHiddenKeyword$ HIDDEN CARDNAME can't attack. | Description$ Creatures targeted player controls can't attack this turn.
+SVar:RemAIDeck:True
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/oriss_samite_guardian.jpg
+SetInfo:FUT|Rare|http://magiccards.info/scans/fut/en/28.jpg
+Oracle:{T}: Prevent all damage that would be dealt to target creature this turn.\nGrandeur - Discard another card named Oriss, Samite Guardian: Target player can't cast spells this turn, and creatures that player controls can't attack this turn.
+End
diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java
index 23c2fb22de6..3c4f606d755 100644
--- a/src/main/java/forge/Card.java
+++ b/src/main/java/forge/Card.java
@@ -6766,6 +6766,13 @@ 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("YouOwn")) {
             if (!this.getOwner().isPlayer(sourceController)) {
                 return false;