external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 19:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
ConquestUtil: skip promos (again) and other reprints when choosing the starting Planeswalker

See merge request core-developers/forge!4161
This commit is contained in:
Michael Kamensky
2021-03-10 06:09:13 +00:00
parent 3914fde25f 076e27851f
commit f68975ede2
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-gui/src/main/java/forge/planarconquest/ConquestUtil.java
View File

@@ -179,7 +179,8 @@ public class ConquestUtil {
return Iterables.filter(FModel.getMagicDb().getCommonCards(), new Predicate<PaperCard>() {
@Override
public boolean apply(PaperCard card) {
if (FModel.getMagicDb().getEditions().get(card.getEdition()).getType() == CardEdition.Type.REPRINT) {
if (FModel.getMagicDb().getEditions().get(card.getEdition()).getType() == CardEdition.Type.PROMOS
|| FModel.getMagicDb().getEditions().get(card.getEdition()).getType() == CardEdition.Type.REPRINT) {
return false; // exclude promos from the starting planeswalker set
}
if (selected.contains(card.getName())) {