From 2ac1d82826cfe683763179b4cc55958f107a06d6 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 16 Jun 2018 00:42:48 +0900
Subject: [PATCH] =?UTF-8?q?buildScoutMessage=EC=97=90=EC=84=9C=20null=20?=
 =?UTF-8?q?=EB=B0=98=ED=99=98=20=EA=B0=80=EB=8A=A5=ED=95=98=EB=8D=98=20?=
 =?UTF-8?q?=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_process_personnel.php                   | 5 ++++-
 hwe/sammo/ScoutMessage.php                       | 2 +-
 hwe/scenario/{scenario_frame.json => frame.json} | 0
 3 files changed, 5 insertions(+), 2 deletions(-)
 rename hwe/scenario/{scenario_frame.json => frame.json} (100%)

diff --git a/hwe/func_process_personnel.php b/hwe/func_process_personnel.php
index a6b74673..4d5ecf24 100644
--- a/hwe/func_process_personnel.php
+++ b/hwe/func_process_personnel.php
@@ -46,7 +46,10 @@ function process_22(&$general) {
         $ded = CharDedication($ded, $general['personal']);
 
         $msg = ScoutMessage::buildScoutMessage($general['no'], $who, $reason);
-        $msg->send(true);
+        if($msg){
+            $msg->send(true);
+        }
+        
         
         $general['intel2']++;
         $query = "update general set resturn='SUCCESS',gold=gold-'$cost',intel2='{$general['intel2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'";
diff --git a/hwe/sammo/ScoutMessage.php b/hwe/sammo/ScoutMessage.php
index e2617581..d84b9bd8 100644
--- a/hwe/sammo/ScoutMessage.php
+++ b/hwe/sammo/ScoutMessage.php
@@ -170,7 +170,7 @@ class ScoutMessage extends Message{
         return self::DECLINED;
     }
 
-    public static function buildScoutMessage(int $srcGeneralID, int $destGeneralID, &$reason = null, \DateTime $date = null): Message{
+    public static function buildScoutMessage(int $srcGeneralID, int $destGeneralID, &$reason = null, \DateTime $date = null){
         if($srcGeneralID == $destGeneralID){
             if($reason !== null){
                 $reason = '같은 장수에게 등용장을 보낼 수 없습니다';
diff --git a/hwe/scenario/scenario_frame.json b/hwe/scenario/frame.json
similarity index 100%
rename from hwe/scenario/scenario_frame.json
rename to hwe/scenario/frame.json