Make Deck.Load always return a deck object

ProjectIgnis · Jul 1, 2021 · 7932d92 · 7932d92
1 parent a93c951
commit 7932d92
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/Game/AI/Deck.cs b/Game/AI/Deck.cs
@@ -31,11 +31,11 @@ private void AddNewCard(int cardId, bool mainDeck, bool sideDeck)
         public static Deck Load(string name)
         {
             StreamReader reader = null;
+            Deck deck = new Deck();
             try
             {
                 reader = new StreamReader(new FileStream(Path.IsPathRooted(name) ? name : Path.Combine(Program.AssetPath, "Decks/", name + ".ydk"), FileMode.Open, FileAccess.Read));
 
-                Deck deck = new Deck();
                 bool main = true;
                 bool side = false;
 
@@ -64,14 +64,13 @@ public static Deck Load(string name)
                 }
 
                 reader.Close();
-
-                return deck;
             }
             catch (Exception)
             {
+                Logger.WriteLine("Failed to load deck: " + name + ".");
                 reader?.Close();
-                return null;
             }
+            return deck;
         }
     }
 }