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[] = "{$this->dest->nationName}(와)과 $when년 불가침에 성공했습니다."; - $mylog[] = "{$this->src->nationName}(와)과 $when년 불가침에 합의했습니다."; + $youlog[] = "{$this->dest->nationName}(와)과 $helper->year년 불가침에 성공했습니다."; + $mylog[] = "{$this->src->nationName}(와)과 $helper->year년 불가침에 합의했습니다."; pushGenLog(['no'=>$this->dest->generalID], $mylog); pushGenLog(['no'=>$this->src->generalID], $youlog); pushGeneralHistory(['no'=>$this->src->generalID], "●{$helper->year}년 {$helper->month}월:{$this->dest->nationName}(와)과 {$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)',