From b2096cc2746c21d93f6b2efaa399f681841193e0 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Tue, 17 Apr 2018 21:35:13 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B6=88=EA=B0=80=EC=B9=A8=20=EC=84=9C?=
 =?UTF-8?q?=EC=8B=A0=20=EA=B0=9C=EC=9B=94=EC=88=98=20=EC=95=88=EB=B3=B4?=
 =?UTF-8?q?=EC=9D=B4=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0,?=
 =?UTF-8?q?=20=EA=B0=9C=EC=9B=94=EC=88=98=20=EB=85=84=EC=9C=BC=EB=A1=9C=20?=
 =?UTF-8?q?=EB=B3=B4=EC=9D=B4=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4?=
 =?UTF-8?q?=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/DiplomaticMessage.php | 4 ++--
 hwe/sammo/Engine/Diplomacy.php  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/hwe/sammo/DiplomaticMessage.php b/hwe/sammo/DiplomaticMessage.php
index 212c02aa..04c5f2ce 100644
--- a/hwe/sammo/DiplomaticMessage.php
+++ b/hwe/sammo/DiplomaticMessage.php
@@ -83,8 +83,8 @@ class DiplomaticMessage extends Message{
             return $chk;
         }
 
-        $youlog[] = "<C>●</><D><b>{$this->dest->nationName}</b></>(와)과 <C>$when</>년 불가침에 성공했습니다.";
-        $mylog[] = "<C>●</><D><b>{$this->src->nationName}</b></>(와)과 <C>$when</>년 불가침에 합의했습니다.";
+        $youlog[] = "<C>●</><D><b>{$this->dest->nationName}</b></>(와)과 <C>$helper->year</>년 불가침에 성공했습니다.";
+        $mylog[] = "<C>●</><D><b>{$this->src->nationName}</b></>(와)과 <C>$helper->year</>년 불가침에 합의했습니다.";
         pushGenLog(['no'=>$this->dest->generalID], $mylog);
         pushGenLog(['no'=>$this->src->generalID], $youlog);
         pushGeneralHistory(['no'=>$this->src->generalID], "<C>●</>{$helper->year}년 {$helper->month}월:<D><b>{$this->dest->nationName}</b></>(와)과 {$when}년 불가침 성공");
diff --git a/hwe/sammo/Engine/Diplomacy.php b/hwe/sammo/Engine/Diplomacy.php
index 89f0a40a..22646381 100644
--- a/hwe/sammo/Engine/Diplomacy.php
+++ b/hwe/sammo/Engine/Diplomacy.php
@@ -282,7 +282,7 @@ class Diplomacy{
         $db = DB::db();
         $db->update('diplomacy',[
             'state'=>7,
-            'term'=>$when,
+            'term'=>$when*12,
             'fixed'=>$option
         ],
         '(me=%i AND you=%i) OR (you=%i AND me=%i)',