From a7f000e51ea8dab8f7723826434ee149ce0ad972 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sun, 28 Apr 2019 02:17:20 +0900
Subject: [PATCH] =?UTF-8?q?=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/sammo/Command/General/che_거병.php | 5 +++++
 hwe/sammo/GeneralAI.php                | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/hwe/sammo/Command/General/che_거병.php b/hwe/sammo/Command/General/che_거병.php
index 93bbee21..3239915d 100644
--- a/hwe/sammo/Command/General/che_거병.php
+++ b/hwe/sammo/Command/General/che_거병.php
@@ -105,6 +105,11 @@ class che_거병 extends Command\GeneralCommand{
         $diplomacyInit = [];
         foreach(getAllNationStaticInfo() as $destNation){
             $destNationID = $destNation['nation'];
+
+            if($nationID == $destNationID){
+                continue;
+            }
+            
             $diplomacyInit[] = [
                 'me'=>$destNationID,
                 'you'=>$nationID,
diff --git a/hwe/sammo/GeneralAI.php b/hwe/sammo/GeneralAI.php
index 3c4f3075..43009ecd 100644
--- a/hwe/sammo/GeneralAI.php
+++ b/hwe/sammo/GeneralAI.php
@@ -1239,10 +1239,10 @@ class GeneralAI{
 
         if($nation['rice'] < 2000){
             if(($genType & self::t통솔장) && $general->getVar('rice') > $baseArmRice){
-                return ['che_헌납', ['isGold'=>false, 'amount'=>($general->getVar('rice') - $baseArmRice) / 2]];
+                return ['che_헌납', ['isGold'=>false, 'amount'=>Util::toInt(($general->getVar('rice') - $baseArmRice) / 2)]];
             }
             else if(!($genType & self::t통솔장)){
-                return ['che_헌납', ['isGold'=>false, 'amount'=>$general->getVar('rice') / 2]];
+                return ['che_헌납', ['isGold'=>false, 'amount'=>Util::toInt($general->getVar('rice') / 2)]];
             }
         }