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

Implement booster collation for (original) Innistrad and Dark Ascension (#8339)

Browse source
This commit is contained in:
Alex W. Jackson 2021-09-29 09:03:46 -04:00 • committed by GitHub
parent f9beed6a89
commit edbb99f0ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 167 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -287,8 +287,10 @@ public abstract class ExpansionSet implements Serializable {
}
private List<Card> createBoosterUsingCollator(BoosterCollator collator) {
if (inBoosterMap.isEmpty()) {
generateBoosterMap();
synchronized (inBoosterMap) {
if (inBoosterMap.isEmpty()) {
generateBoosterMap();
}
}
return collator
.makeBooster()
@ -304,6 +306,15 @@ public abstract class ExpansionSet implements Serializable {
.findCards(new CardCriteria().setCodes(code))
.stream()
.forEach(cardInfo -> inBoosterMap.put(cardInfo.getCardNumber(), cardInfo));
// get basic lands from parent set if this set doesn't have them
if (!hasBasicLands && parentSet != null) {
String parentCode = parentSet.code;
CardRepository
.instance
.findCards(new CardCriteria().setCodes(parentCode).rarities(Rarity.LAND))
.stream()
.forEach(cardInfo -> inBoosterMap.put(parentCode + "_" + cardInfo.getCardNumber(), cardInfo));
}
}
protected boolean boosterIsValid(List<Card> booster) {
@ -621,9 +632,9 @@ public abstract class ExpansionSet implements Serializable {
List<CardInfo> savedCardsInfos = savedCards.get(rarity);
if (savedCardsInfos == null) {
CardCriteria criteria = new CardCriteria();
if (rarity == Rarity.LAND) {
// get basic lands from parent set if current haven't it
criteria.setCodes(!hasBasicLands && parentSet != null ? parentSet.code : this.code);
if (rarity == Rarity.LAND && !hasBasicLands && parentSet != null) {
// get basic lands from parent set if this set doesn't have them
criteria.setCodes(parentSet.code);
} else {
criteria.setCodes(this.code);
}