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 @@
+10 Mar. 2013
+- Free people cards should no longer allow playing shadow cards and vice-versa.
+
8 Mar. 2013
- 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);
+ }
+ });
}
}