diff --git a/src/main/java/forge/quest/data/QuestAssets.java b/src/main/java/forge/quest/data/QuestAssets.java index dfc50cc9161..7d92d7d3f68 100644 --- a/src/main/java/forge/quest/data/QuestAssets.java +++ b/src/main/java/forge/quest/data/QuestAssets.java @@ -165,10 +165,14 @@ public class QuestAssets { /** * Instantiates a new quest assets. */ - public QuestAssets() { + public QuestAssets(GameFormatQuest useFormat) { final QuestPreferences prefs = Singletons.getModel().getQuestPreferences(); + int snowLands = prefs.getPreferenceInt(QPref.STARTING_SNOW_LANDS); + if (useFormat != null && !useFormat.hasSnowLands()) { + snowLands = 0; + } final ItemPoolView lands = QuestUtilCards.generateBasicLands( - prefs.getPreferenceInt(QPref.STARTING_BASIC_LANDS), prefs.getPreferenceInt(QPref.STARTING_SNOW_LANDS)); + prefs.getPreferenceInt(QPref.STARTING_BASIC_LANDS), snowLands); this.getCardPool().addAll(lands); } diff --git a/src/main/java/forge/quest/data/QuestData.java b/src/main/java/forge/quest/data/QuestData.java index 5a35778b71f..a369d53d901 100644 --- a/src/main/java/forge/quest/data/QuestData.java +++ b/src/main/java/forge/quest/data/QuestData.java @@ -82,7 +82,7 @@ public final class QuestData { } this.mode = mode2; this.achievements = new QuestAchievements(diff); - this.assets = new QuestAssets(); + this.assets = new QuestAssets(format); } /** diff --git a/src/main/java/forge/quest/io/QuestDataIO.java b/src/main/java/forge/quest/io/QuestDataIO.java index caa13aacdb5..8d26ea48245 100644 --- a/src/main/java/forge/quest/io/QuestDataIO.java +++ b/src/main/java/forge/quest/io/QuestDataIO.java @@ -185,7 +185,7 @@ public class QuestDataIO { final int saveVersion = newData.getVersionNumber(); if (saveVersion < 3) { - QuestDataIO.setFinalField(QuestData.class, "assets", newData, new QuestAssets()); + QuestDataIO.setFinalField(QuestData.class, "assets", newData, new QuestAssets(null)); final int diffIdx = Integer.parseInt(document.getElementsByTagName("diffIndex").item(0).getTextContent()); QuestDataIO.setFinalField(QuestData.class, "achievements", newData, new QuestAchievements(diffIdx));