From b888be9dad7d9e6028537b22f61025d851d1f38e Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 30 Apr 2020 13:40:55 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B6=80=EB=8C=80=EC=9C=A0=EC=A0=80=EC=9E=A5?=
 =?UTF-8?q?=20=ED=9B=84=EB=B0=A9=EB=B0=9C=EB=A0=B9=20=EB=B2=84=EA=B7=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/General.php   | 2 +-
 hwe/sammo/GeneralAI.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hwe/sammo/General.php b/hwe/sammo/General.php
index ae85060f..cd0a5939 100644
--- a/hwe/sammo/General.php
+++ b/hwe/sammo/General.php
@@ -1052,7 +1052,7 @@ class General implements iAction{
 
         $db = DB::db();
         $result = [];
-        $rawCmds = Util::convertArrayToDict($db->queryFirstRow('SELECT * FROM general_turn WHERE general_id IN %i AND turn_idx = %i', $generalIDList, $turnIdx), 'general_id');
+        $rawCmds = Util::convertArrayToDict($db->queryFirstRow('SELECT * FROM general_turn WHERE general_id IN %li AND turn_idx = %i', $generalIDList, $turnIdx), 'general_id');
         foreach($generalList as $general){
             $generalID = $general->getID();
             if(!key_exists($generalID, $rawCmds)){
diff --git a/hwe/sammo/GeneralAI.php b/hwe/sammo/GeneralAI.php
index 1c7781d0..a76d2624 100644
--- a/hwe/sammo/GeneralAI.php
+++ b/hwe/sammo/GeneralAI.php
@@ -492,7 +492,7 @@ class GeneralAI
             return null;
         }
 
-        $turnList = General::getReservedTurnByGeneralList($generalCadidates, 0, $this->env);
+        $turnList = General::getReservedTurnByGeneralList(array_keys($generalCadidates), 0, $this->env);
         $generalCadidates = array_filter($generalCadidates, function(General $general)use($turnList){
             $generalID = $general->getID();
             if($turnList[$generalID] instanceof Command\General\che_징병){