From 9585b8f5a7f83d09768a4a503e72dd1c823c27c2 Mon Sep 17 00:00:00 2001
From: Kazuhiro Fujieda <fujieda@users.osdn.me>
Date: Sat, 18 Nov 2017 23:27:53 +0900
Subject: [PATCH] =?utf8?q?=E9=96=8B=E5=B9=95=E5=A4=9C=E6=88=A6=E3=81=A7?=
 =?utf8?q?=E6=BD=9C=E6=B0=B4=E8=89=A6=E5=90=8C=E5=A3=AB=E3=81=8C=E3=81=8A?=
 =?utf8?q?=E8=A6=8B=E5=90=88=E3=81=84=E3=81=99=E3=82=8B=E3=81=A8=E3=82=A8?=
 =?utf8?q?=E3=83=A9=E3=83=BC=E3=81=AB=E3=81=AA=E3=82=8B=E3=81=AE=E3=82=92?=
 =?utf8?q?=E7=9B=B4=E3=81=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 KancolleSniffer.Test/SnifferTest.cs | 11 +++++++++++
 KancolleSniffer.Test/logs           |  2 +-
 KancolleSniffer/BattleInfo.cs       |  5 +++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/KancolleSniffer.Test/SnifferTest.cs b/KancolleSniffer.Test/SnifferTest.cs
index d6d0b30..c6d03f7 100644
--- a/KancolleSniffer.Test/SnifferTest.cs
+++ b/KancolleSniffer.Test/SnifferTest.cs
@@ -61,6 +61,17 @@ namespace KancolleSniffer.Test
         }
 
         /// <summary>
+        /// 開幕夜戦で潜水艦同士がお見合いする
+        /// </summary>
+        [TestMethod]
+        public void SpMidnightWithoutBattle()
+        {
+            var sniffer = new Sniffer();
+            SniffLogFile(sniffer, "sp_midnight_001");
+            PAssert.That(() => sniffer.Battle.ResultRank == BattleResultRank.D);
+        }
+
+        /// <summary>
         /// 出撃時に大破している艦娘がいたら警告する
         /// </summary>
         [TestMethod]
diff --git a/KancolleSniffer.Test/logs b/KancolleSniffer.Test/logs
index c02447e..d646e5d 160000
--- a/KancolleSniffer.Test/logs
+++ b/KancolleSniffer.Test/logs
@@ -1 +1 @@
-Subproject commit c02447eaf1cccdae6493b76fbb14e7eee34bc750
+Subproject commit d646e5daaceda98d136ff1b7c13090e4cb7772a4
diff --git a/KancolleSniffer/BattleInfo.cs b/KancolleSniffer/BattleInfo.cs
index 2ed6599..ab03507 100644
--- a/KancolleSniffer/BattleInfo.cs
+++ b/KancolleSniffer/BattleInfo.cs
@@ -442,6 +442,11 @@ namespace KancolleSniffer
         private void CalcCombinedHougekiDamage(dynamic hougeki, Record[] friend, Record[] guard,
             int[] enemy, int[] enemyGuard)
         {
+            if (!(hougeki.api_df_list() && hougeki.api_df_list != null &&
+                  hougeki.api_damage() && hougeki.api_damage != null &&
+                  hougeki.api_at_eflag() && hougeki.api_at_eflag != null))
+                return;
+
             var targets = ((dynamic[])hougeki.api_df_list).Select(x => (int[])x);
             var damages = ((dynamic[])hougeki.api_damage).Select(x => (int[])x);
             var eflags = (int[])hougeki.api_at_eflag;
-- 
2.11.0