diff --git a/Mage/src/mage/cards/repository/CardCriteria.java b/Mage/src/mage/cards/repository/CardCriteria.java index 11d2d2ac4d..090783bc75 100644 --- a/Mage/src/mage/cards/repository/CardCriteria.java +++ b/Mage/src/mage/cards/repository/CardCriteria.java @@ -256,11 +256,17 @@ public class CardCriteria { where.and(5); colorClauses++; } - where.or(colorClauses); - clausesCount++; + if (colorClauses > 0) { + where.or(colorClauses); + clausesCount++; + } } - where.and(clausesCount); + if (clausesCount > 0) { + where.and(clausesCount); + } else { + where.eq("cardNumber", new SelectArg(0)); + } if (start != null) { qb.offset(start);