fix(HearthDbConverter): crash in ToHearthDbDeck due to invalid property

HearthSim · Dec 22, 2023 · ed72f36 · ed72f36
1 parent ad2608c
commit ed72f36
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/Hearthstone Deck Tracker/Hearthstone/HearthDbConverter.cs b/Hearthstone Deck Tracker/Hearthstone/HearthDbConverter.cs
@@ -328,8 +328,12 @@ public static BnetGameType GetBnetGameType(GameType gameType, Format? format)
 			{
 				dbfIds = cards.ToDictionary(c => c.DbfId, c => c.Count);
 				sideboards = deck.Sideboards.Select(s =>
-					new { owner = Database.GetCardFromId(s.Key), sideboard = s.Value.ToDictionary(c => c.DbfId, c => c.Count) }
-				).Where(s => s.owner != null).ToDictionary(s => s.owner!.DbfId, s => s.sideboard);
+					new
+					{
+						owner = Database.GetCardFromId(s.Key),
+						sideboard = s.Value.ToDictionary(c => Database.GetCardFromId(c.Id)?.DbfId ?? 0, c => c.Count)
+					}
+				).Where(s => s.owner != null && s.sideboard.Keys.All(x => x != 0)).ToDictionary(s => s.owner!.DbfId, s => s.sideboard);
 			}
 			catch
 			{