From c117ada117fbb5f1ae5d929cb139146ad17bc82a Mon Sep 17 00:00:00 2001
From: Hide_D <hided62@gmail.com>
Date: Mon, 23 Sep 2024 13:35:28 +0000
Subject: [PATCH] =?UTF-8?q?fix:=20event=20=EC=BB=A4=EB=A7=A8=EB=93=9C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=20-=20=ED=83=91=EC=8A=B9=EC=A6=89=EC=8B=9C?=
 =?UTF-8?q?=EC=9D=B4=EB=8F=99:=20=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80=20=EC=A1=B0=EC=82=AC=20=EC=A0=9C=EA=B1=B0=20?=
 =?UTF-8?q?-=20=EB=B0=9C=EB=A0=B9=EC=A6=89=EC=8B=9C=EC=A7=91=ED=95=A9:=20?=
 =?UTF-8?q?=EB=B0=9C=EB=A0=B9=EC=9E=90=EA=B0=80=20=ED=83=91=EC=8A=B9?=
 =?UTF-8?q?=EC=A4=91=EC=9D=B8=20=EA=B2=BD=EC=9A=B0=20=EB=B3=80=EC=88=98?=
 =?UTF-8?q?=EA=B0=92=20=EB=B3=80=EA=B2=BD=20=20=20-=20=EC=9E=A5=EC=88=98?=
 =?UTF-8?q?=20=EC=BB=A4=EB=A7=A8=EB=93=9C=20=EC=8B=A4=ED=96=89=20=EC=8B=9C?=
 =?UTF-8?q?=20cityID=EC=97=90=20=EB=94=B0=EB=9D=BC=20=EB=8B=A4=EC=8B=9C=20?=
 =?UTF-8?q?=EB=B0=9B=EC=95=84=EC=98=A4=EB=AF=80=EB=A1=9C=20=ED=95=B4?=
 =?UTF-8?q?=EB=8B=B9=20=EB=B3=80=EA=B2=BD=EC=9C=BC=EB=A1=9C=20=EC=B6=A9?=
 =?UTF-8?q?=EB=B6=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/StaticEvent/event_부대발령즉시집합.php | 4 ++++
 hwe/sammo/StaticEvent/event_부대탑승즉시이동.php | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/hwe/sammo/StaticEvent/event_부대발령즉시집합.php b/hwe/sammo/StaticEvent/event_부대발령즉시집합.php
index 488a6dff..0eff569a 100644
--- a/hwe/sammo/StaticEvent/event_부대발령즉시집합.php
+++ b/hwe/sammo/StaticEvent/event_부대발령즉시집합.php
@@ -48,6 +48,10 @@ class event_부대발령즉시집합 extends \sammo\BaseStaticEvent
                 'city'=>$destCityID
             ], 'no IN %li', $generalList);
         }
+        if($general->getVar('troop') === $troopID){
+            $general->setVar('city', $destCityID);
+        }
+
         foreach($generalList as $targetGeneralID){
             $targetLogger = new ActionLogger($targetGeneralID, $general->getNationID(), $env['year'], $env['month']);
             $targetLogger->pushGeneralActionLog("{$troopName} 부대원들은 <G><b>{$cityName}</b></>{$josaRo} 즉시 집합되었습니다.", ActionLogger::PLAIN);
diff --git a/hwe/sammo/StaticEvent/event_부대탑승즉시이동.php b/hwe/sammo/StaticEvent/event_부대탑승즉시이동.php
index 51fd94b2..21acc01d 100644
--- a/hwe/sammo/StaticEvent/event_부대탑승즉시이동.php
+++ b/hwe/sammo/StaticEvent/event_부대탑승즉시이동.php
@@ -43,7 +43,7 @@ class event_부대탑승즉시이동 extends \sammo\BaseStaticEvent
         $cityName = CityConst::byID($destGeneral->getCityID())->name;
         $general->setVar('city', $destGeneral->getCityID());
         $josaRo = JosaUtil::pick($cityName, '로');
-        $general->getLogger()->pushGeneralActionLog("부대 주둔지인 <G><b>{$cityName}</b></>{$josaRo}로 즉시 이동합니다.", ActionLogger::PLAIN);
+        $general->getLogger()->pushGeneralActionLog("부대 주둔지인 <G><b>{$cityName}</b></>{$josaRo} 즉시 이동합니다.", ActionLogger::PLAIN);
         $general->applyDB(DB::db());
 
         return true;