github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 11:09:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improved CardCriteria to handle no selected color or card type without exception.

Browse source
This commit is contained in:
LevelX2 2012-11-27 17:18:53 +01:00
parent 4b2e6a8bc0
commit caa07069b4
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Mage/src/mage/cards/repository/CardCriteria.java
View file

@ -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);