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_징병){