External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-26 05:22:02 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove no longer needed CardCriteria workaround

Browse source
This commit is contained in:
Alex W. Jackson 2021-12-24 03:05:28 -05:00
parent b2b90c17fd
commit 881fdcaa08
11 changed files with 26 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Mage/src/main/java/mage/cards/ExpansionSet.java
View file

@ -519,11 +519,11 @@ public abstract class ExpansionSet implements Serializable {
List<CardInfo> cardInfos = CardRepository.instance.findCards(new CardCriteria()
.setCodes(this.code)
.rarities(rarity));
.rarities(rarity)
.maxCardNumber(maxCardNumberInBooster));
cardInfos.removeIf(next -> (
next.getCardNumberAsInt() > maxCardNumberInBooster
|| next.getCardNumber().contains("*")
next.getCardNumber().contains("*")
|| next.getCardNumber().contains("+")));
// special slot cards must not also appear in regular slots of their rarity
@ -557,7 +557,8 @@ public abstract class ExpansionSet implements Serializable {
cardInfos.addAll(CardRepository.instance.findCards(new CardCriteria()
.setCodes(this.code)
.rarities(Rarity.COMMON)
.types(CardType.LAND)));
.types(CardType.LAND)
.maxCardNumber(maxCardNumberInBooster)));
}
// if set has special slot(s) for DFCs, they are special cards
@ -565,12 +566,12 @@ public abstract class ExpansionSet implements Serializable {
cardInfos.addAll(CardRepository.instance.findCards(new CardCriteria()
.setCodes(this.code)
.rarities(rarity)
.doubleFaced(true)));
.doubleFaced(true)
.maxCardNumber(maxCardNumberInBooster)));
}
cardInfos.removeIf(next -> (
next.getCardNumberAsInt() > maxCardNumberInBooster
|| next.getCardNumber().contains("*")
next.getCardNumber().contains("*")
|| next.getCardNumber().contains("+")));
return cardInfos;