Merge pull request #2408 from jjayers99/master

Correction to Adventure Mode edition filter
This commit is contained in:
Anthony Calosa
2023-02-07 01:42:30 +08:00
committed by GitHub

View File

@@ -57,8 +57,18 @@ public class CardUtil {
public boolean apply(final PaperCard card) {
if(!this.rarities.isEmpty()&&!this.rarities.contains(card.getRarity()))
return !this.shouldBeEqual;
if(!this.editions.isEmpty()&&!this.editions.contains(card.getEdition()))
if(!this.editions.isEmpty()&&!this.editions.contains(card.getEdition())) {
boolean found = false;
List<PaperCard> allPrintings = FModel.getMagicDb().getCommonCards().getAllCards(card.getCardName());
for (PaperCard c : allPrintings){
if (this.editions.contains(c.getEdition())) {
found = true;
break;
}
}
if (!found)
return !this.shouldBeEqual;
}
if(!this.manaCosts.isEmpty()&&!this.manaCosts.contains(card.getRules().getManaCost().getCMC()))
return !this.shouldBeEqual;
if(this.text!=null&& !this.text.matcher(card.getRules().getOracleText()).find())