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

[STX] added booster collation

Browse source
This commit is contained in:
Evan Kranzler 2021-04-25 22:19:00 -04:00
parent 45a50d9707
commit d6c3ef33f0
3 changed files with 253 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -284,13 +284,7 @@ public abstract class ExpansionSet implements Serializable {
private List<Card> createBoosterUsingCollator() {
if (inBoosterMap.isEmpty()) {
CardCriteria criteria = new CardCriteria();
criteria.setCodes(code);
CardRepository
.instance
.findCards(criteria)
.stream()
.forEach(cardInfo -> inBoosterMap.put(cardInfo.getCardNumber(), cardInfo));
generateBoosterMap();
}
return boosterCollator
.makeBooster()
@ -300,6 +294,14 @@ public abstract class ExpansionSet implements Serializable {
.collect(Collectors.toList());
}
protected void generateBoosterMap() {
CardRepository
.instance
.findCards(new CardCriteria().setCodes(code))
.stream()
.forEach(cardInfo -> inBoosterMap.put(cardInfo.getCardNumber(), cardInfo));
}
protected boolean boosterIsValid(List<Card> booster) {
if (validateBoosterColors) {
if (!validateColors(booster)) {