Merge pull request planetarium#267 from hskim881028/bugfix/add-except…

…ion-handling-for-reward-item Add exception handling for reward item
limebell · Jan 8, 2021 · 2e1ac08 · 2e1ac08
2 parents afd750e + e8fe2eb
commit 2e1ac08
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/Lib9c/Battle/StageSimulator.cs b/Lib9c/Battle/StageSimulator.cs
@@ -18,7 +18,7 @@ public class StageSimulator : Simulator
     {
         private readonly List<Wave> _waves;
         private readonly StageSheet.Row _stageRow;
-        private List<ItemBase> _waveRewards;
+        private List<ItemBase> _waveRewards = new List<ItemBase>();
         public CollectionMap ItemMap = new CollectionMap();
         public readonly EnemySkillSheet EnemySkillSheet;
 

diff --git a/Lib9c/Model/Quest/Quest.cs b/Lib9c/Model/Quest/Quest.cs
@@ -341,6 +341,11 @@ public void UpdateItemGradeQuest(ItemUsable itemUsable)
 
         public void UpdateItemTypeCollectQuest(IEnumerable<ItemBase> items)
         {
+            if (items == null)
+            {
+                return;
+            }
+
             foreach (var item in items.OrderBy(i => i.Id))
             {
                 var targets = _quests