From 761c93f78aab929c5a59157ff70d5ecdb5fd17f8 Mon Sep 17 00:00:00 2001 From: myk Date: Mon, 11 Feb 2013 01:52:56 +0000 Subject: [PATCH] don't count decks and packs as having color or card type --- src/main/java/forge/card/CardRulesPredicates.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/forge/card/CardRulesPredicates.java b/src/main/java/forge/card/CardRulesPredicates.java index 5f0aceff836..248222314d1 100644 --- a/src/main/java/forge/card/CardRulesPredicates.java +++ b/src/main/java/forge/card/CardRulesPredicates.java @@ -339,7 +339,7 @@ public final class CardRulesPredicates { @Override public boolean apply(final CardRules subject) { if (null == subject) { - return true; + return false; } switch (this.op) { case CountColors: @@ -417,7 +417,7 @@ public final class CardRulesPredicates { @Override public boolean apply(final CardRules card) { if (null == card) { - return true; + return false; } return this.shouldBeEqual == card.getType().typeContains(this.operand); }