From eb0cafc6650b33e817e59bc6579bfce819985700 Mon Sep 17 00:00:00 2001
From: swordshine <swordshine@cardforge.org>
Date: Thu, 28 Feb 2013 06:10:22 +0000
Subject: [PATCH] - Added Cornered Market

---
 .gitattributes                        |  1 +
 res/cardsfolder/c/cornered_market.txt | 10 ++++++++++
 src/main/java/forge/Card.java         |  9 +++++++++
 3 files changed, 20 insertions(+)
 create mode 100644 res/cardsfolder/c/cornered_market.txt

diff --git a/.gitattributes b/.gitattributes
index a0cc9fbc1d3..84650500642 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1991,6 +1991,7 @@ res/cardsfolder/c/coral_trickster.txt svneol=native#text/plain
 res/cardsfolder/c/coralhelm_commander.txt svneol=native#text/plain
 res/cardsfolder/c/core_prowler.txt svneol=native#text/plain
 res/cardsfolder/c/coretapper.txt svneol=native#text/plain
+res/cardsfolder/c/cornered_market.txt -text
 res/cardsfolder/c/corpse_blockade.txt -text
 res/cardsfolder/c/corpse_connoisseur.txt svneol=native#text/plain
 res/cardsfolder/c/corpse_cur.txt svneol=native#text/plain
diff --git a/res/cardsfolder/c/cornered_market.txt b/res/cardsfolder/c/cornered_market.txt
new file mode 100644
index 00000000000..bf77439b7ae
--- /dev/null
+++ b/res/cardsfolder/c/cornered_market.txt
@@ -0,0 +1,10 @@
+Name:Cornered Market
+ManaCost:2 W
+Types:Enchantment
+S:Mode$ CantPlayLand | ValidCard$ Land.nonBasic+sharesNameWith NonToken | Description$ Players can't play nonbasic lands with the same name as a nontoken permanent.
+S:Mode$ CantBeCast | ValidCard$ Card.sharesNameWith NonToken | Description$ Players can't cast spells with the same name as a nontoken permanent.
+SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/cornered_market.jpg
+SetInfo:MMQ|Rare|http://magiccards.info/scans/en/mm/14.jpg
+Oracle:Players can't cast spells with the same name as a nontoken permanent.\nPlayers can't play nonbasic lands with the same name as a nontoken permanent.
diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java
index 8fd257079fd..5888ad491ae 100644
--- a/src/main/java/forge/Card.java
+++ b/src/main/java/forge/Card.java
@@ -6830,6 +6830,15 @@ public class Card extends GameEntity implements Comparable<Card> {
                         }
                     }
                     return false;
+                } else if (restriction.equals("NonToken")) {
+                    final List<Card> list = CardLists.filter(Singletons.getModel().getGame().getCardsIn(ZoneType.Battlefield),
+                            Presets.NON_TOKEN);
+                    for (final Card card : list) {
+                        if (this.getName().equals(card.getName())) {
+                            return true;
+                        }
+                    }
+                    return false;
                 }
             }
         } else if (property.startsWith("sharesControllerWith")) {