基地航空隊噴式強襲するとエラーになることがあるのを直す

diff --git a/KancolleSniffer.Test/SnifferTest.cs b/KancolleSniffer.Test/SnifferTest.cs
index a231bf2..8701f75 100644 (file)
--- a/KancolleSniffer.Test/SnifferTest.cs
+++ b/KancolleSniffer.Test/SnifferTest.cs
@@ -662,6 +662,17 @@ namespace KancolleSniffer.Test
         }\r
 \r
         /// <summary>\r
+        /// 基地航空隊噴式強襲でapi_stage3_combinedがnullの場合に対応する\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void AirbaseInjection()\r
+        {\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "airbase_injection_001");\r
+            PAssert.That(() => sniffer.Battle.ResultRank == BattleResultRank.P);\r
+        }\r
+\r
+        /// <summary>\r
         /// 対空砲火のパラメータを計算する\r
         /// </summary>\r
         [TestMethod]\r

diff --git a/KancolleSniffer.Test/logs b/KancolleSniffer.Test/logs
index d5a1fdf..2cb3bb2 160000 (submodule)
--- a/KancolleSniffer.Test/logs
+++ b/KancolleSniffer.Test/logs
@@ -1 +1 @@
-Subproject commit d5a1fdfc22bc198480fcc630a86af3ae3b61de7d
+Subproject commit 2cb3bb2685dd192ed1a05fe610944075c9f1c959

diff --git a/KancolleSniffer/BattleInfo.cs b/KancolleSniffer/BattleInfo.cs
index cff6c47..6e52a3a 100644 (file)
--- a/KancolleSniffer/BattleInfo.cs
+++ b/KancolleSniffer/BattleInfo.cs
@@ -427,10 +427,9 @@ namespace KancolleSniffer
 \r
         private void CalcKoukuDamage(dynamic json)\r
         {\r
-            if (!json.api_stage3() || json.api_stage3 == null)\r
-                return;\r
-            CalcSimpleDamage(json.api_stage3, _friend, _enemyHp);\r
-            if (json.api_stage3_combined())\r
+            if (json.api_stage3() && json.api_stage3 != null)\r
+                CalcSimpleDamage(json.api_stage3, _friend, _enemyHp);\r
+            if (json.api_stage3_combined() && json.api_stage3_combined != null)\r
                 CalcSimpleDamage(json.api_stage3_combined, _guard, _enemyGuardHp);\r
         }\r
 \r