From 77938a8b90b66bc006963fd29907b649d3929d15 Mon Sep 17 00:00:00 2001
From: Alessandro Coli <alex.coli.1979@gmail.com>
Date: Sun, 11 Oct 2020 14:22:51 +0200
Subject: [PATCH] Implementation to make available (for Wild opponents) also
 the decks stored in subfolders of the main "constructed" folder

---
 .../main/java/forge/quest/io/MainWorldDuelReader.java  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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<QuestEventDuel> {
@@ -77,10 +76,11 @@ public class MainWorldDuelReader extends StorageReaderFolder<QuestEventDuel> {
         }
 
         // then I add wild decks in constructed directory
-        IStorage<Deck> constructedDecks = FModel.getDecks().getConstructed();
-        Iterator it = constructedDecks.iterator();
+        Iterable<DeckProxy> constructedDecks = DeckProxy.getAllConstructedDecks();
+        Iterator<DeckProxy> 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)) {