From 253d2a74d7f14223becc888e4986f9f238b7d80f Mon Sep 17 00:00:00 2001
From: "marcins78@gmail.com"
 <marcins78@gmail.com@eb7970ca-0f6f-de4b-2938-835b230b9d1f>
Date: Sun, 10 Mar 2013 19:35:46 +0000
Subject: [PATCH] - Free people cards should no longer allow playing shadow
 cards and vice-versa.

---
 .../src/main/web/includes/changeLog.html      |  3 +++
 .../gempukku/lotro/cards/ExtraFilters.java    | 19 ++++++++++---------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html b/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html
index b51908b49..05a8f1ed8 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html
@@ -1,4 +1,7 @@
 <pre style="font-size:80%">
+<b>10 Mar. 2013</b>
+- Free people cards should no longer allow playing shadow cards and vice-versa.
+
 <b>8 Mar. 2013</b>
 - You can't play events outside of their phase now, when using other cards like "Dammed Gate-Stream" or "Bilbo, Bearer
 of Things Burgled". Response events can't be played at all using other cards.
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/ExtraFilters.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/ExtraFilters.java
index 54a244ae7..c3c57c33a 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/ExtraFilters.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/ExtraFilters.java
@@ -14,14 +14,15 @@ public class ExtraFilters {
     }
 
     public static Filter attachableTo(final LotroGame game, final int twilightModifier, final Filterable... filters) {
-        return new Filter() {
-            @Override
-            public boolean accepts(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard) {
-                if (!(physicalCard.getBlueprint() instanceof AbstractAttachable))
-                    return false;
-                AbstractAttachable weapon = (AbstractAttachable) physicalCard.getBlueprint();
-                return weapon.checkPlayRequirements(physicalCard.getOwner(), game, physicalCard, 0, Filters.and(filters), twilightModifier);
-            }
-        };
+        return Filters.and(Filters.playable(game),
+                new Filter() {
+                    @Override
+                    public boolean accepts(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard) {
+                        if (!(physicalCard.getBlueprint() instanceof AbstractAttachable))
+                            return false;
+                        AbstractAttachable weapon = (AbstractAttachable) physicalCard.getBlueprint();
+                        return weapon.checkPlayRequirements(physicalCard.getOwner(), game, physicalCard, 0, Filters.and(filters), twilightModifier);
+                    }
+                });
     }
 }