From b6a6ee31ed1352493292cf69cb1890c0917e3e1b Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 9 May 2020 12:20:52 +0900
Subject: [PATCH] =?UTF-8?q?=EC=84=A4=EB=AC=B8=EC=A1=B0=EC=82=AC=EC=8B=9C?=
 =?UTF-8?q?=20=EC=95=84=EC=9D=B4=ED=85=9C=EC=9D=84=20=EC=95=88=20=EA=B0=80?=
 =?UTF-8?q?=EC=A7=84=EA=B2=83=EC=9C=BC=EB=A1=9C=20=ED=8C=90=EC=A0=95?=
 =?UTF-8?q?=ED=95=98=EB=8A=94=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/c_vote.php             | 2 +-
 hwe/sammo/ScoutMessage.php | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/hwe/c_vote.php b/hwe/c_vote.php
index 86b02016..919361e6 100644
--- a/hwe/c_vote.php
+++ b/hwe/c_vote.php
@@ -24,7 +24,7 @@ $admin = $gameStor->getValues(['develcost', 'cost', 'vote_title', 'vote', 'votec
 
 $generalID = Session::getGeneralID();
 
-$general = General::createGeneralObjFromDB($generalID, ['vote','horse','weapon','book','item','npc'], 1);
+$general = General::createGeneralObjFromDB($generalID, ['vote','horse','weapon','book','item','npc'], 2);
 
 if($btn == "투표" && $general->getVar('vote') == 0 && $sel > 0) {
     $develcost = $admin['develcost'] * 5;
diff --git a/hwe/sammo/ScoutMessage.php b/hwe/sammo/ScoutMessage.php
index ad4479a7..f4e75703 100644
--- a/hwe/sammo/ScoutMessage.php
+++ b/hwe/sammo/ScoutMessage.php
@@ -80,8 +80,6 @@ class ScoutMessage extends Message{
         $commandObj = buildGeneralCommandClass('che_등용수락', $general, $gameStor->getAll(true), [
             'destNationID'=>$this->src->nationID,
             'destGeneralID'=>$this->src->generalID,
-            'year'=>$this->msgOption['year'],
-            'month'=>$this->msgOption['month']
         ]);
 
         if(!$commandObj->hasFullConditionMet()){