diff --git a/forge-gui/src/main/java/forge/quest/io/MainWorldDuelReader.java b/forge-gui/src/main/java/forge/quest/io/MainWorldDuelReader.java index 633d4d602ee..22fe331d71a 100644 --- a/forge-gui/src/main/java/forge/quest/io/MainWorldDuelReader.java +++ b/forge-gui/src/main/java/forge/quest/io/MainWorldDuelReader.java @@ -18,16 +18,15 @@ import org.apache.commons.lang3.StringUtils; import forge.ImageKeys; import forge.deck.Deck; +import forge.deck.DeckProxy; import forge.deck.io.DeckSerializer; import forge.deck.io.DeckStorage; -import forge.model.FModel; import forge.quest.QuestEvent; import forge.quest.QuestEventDifficulty; import forge.quest.QuestEventDuel; import forge.util.FileSection; import forge.util.FileUtil; import forge.util.TextUtil; -import forge.util.storage.IStorage; import forge.util.storage.StorageReaderFolder; public class MainWorldDuelReader extends StorageReaderFolder { @@ -77,10 +76,11 @@ public class MainWorldDuelReader extends StorageReaderFolder { } // then I add wild decks in constructed directory - IStorage constructedDecks = FModel.getDecks().getConstructed(); - Iterator it = constructedDecks.iterator(); + Iterable constructedDecks = DeckProxy.getAllConstructedDecks(); + Iterator it = constructedDecks.iterator(); + while(it.hasNext()) { - Deck currDeck = (Deck) it.next(); + Deck currDeck = it.next().getDeck(); final QuestEventDuel newDeck = read(currDeck); String newKey = keySelector.apply(newDeck); if (result.containsKey(newKey)) {