From c3c99c5f76b4a07ad39ae3e6df99daad3657bcc5 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Tue, 12 Oct 2021 01:31:16 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=EA=B3=B5=EA=B2=A9=EC=9E=90=20=EC=A0=84?=
 =?UTF-8?q?=ED=88=AC=EB=A0=A5=20=ED=8C=90=EC=A0=95=20=EB=AC=B8=EC=A0=9C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/WarUnitGeneral.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/hwe/sammo/WarUnitGeneral.php b/hwe/sammo/WarUnitGeneral.php
index 800cce28..9b430259 100644
--- a/hwe/sammo/WarUnitGeneral.php
+++ b/hwe/sammo/WarUnitGeneral.php
@@ -56,6 +56,9 @@ class WarUnitGeneral extends WarUnit
             $semiTurn = $general->getTurnTime();
         } else if ($oppose !== null) {
             $semiTurn = $oppose->getGeneral()->getTurnTime();
+        } else {
+            LogText("WarUnitGeneral::setOppose", "defender인데 oppose가 null {$general->getID()}, {$general->getTurnTime()}");
+            $semiTurn = $general->getTurnTime();
         }
         $phase = $this->getRealPhase();
         $semiTurn = substr($semiTurn, 0, strlen($semiTurn) - 2);
@@ -205,7 +208,7 @@ class WarUnitGeneral extends WarUnit
         if ($this->isAttacker) {
             if ($officerLevel == 12) {
                 $warPower *= 1.10;
-            } else if ($officerLevel == 11 | $officerLevel == 10 || $officerLevel == 8 || $officerLevel == 6) {
+            } else if ($officerLevel == 11 || $officerLevel == 10 || $officerLevel == 8 || $officerLevel == 6) {
                 $warPower *= 1.05;
             }
         } else {