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 'conquest' into 'master'

Browse Source 
Allow cards from precon products in Planar Conquest

See merge request core-developers/forge!4573
This commit is contained in:
Michael Kamensky
2021-04-24 07:36:12 +00:00
parent 45440adc01 e8c0655186
commit 9b83c78346
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestPlane.java
View File

@@ -194,7 +194,7 @@ public class ConquestPlane {
for (String setCode : setCodes) {
CardEdition edition = FModel.getMagicDb().getEditions().get(setCode);
if (edition != null) {
for (CardInSet card : edition.getCards()) {
for (CardInSet card : edition.getAllCardsInSet()) {
if (bannedCardSet == null || !bannedCardSet.contains(card.name)) {
addCard(commonCards.getCard(card.name, setCode));
}