From ed2bc8c390a3f0a2a66a4b4c6bc07bf43aebddb2 Mon Sep 17 00:00:00 2001 From: hide_d Date: Fri, 13 Mar 2020 01:45:42 +0900 Subject: [PATCH] =?UTF-8?q?=EB=93=B1=EC=9A=A9=EC=88=98=EB=9D=BD=EC=97=90?= =?UTF-8?q?=EC=84=9C=20destNationID=20=EB=B9=A0=EC=A7=84=EA=B2=83=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/sammo/Command/General/che_등용수락.php | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/hwe/sammo/Command/General/che_등용수락.php b/hwe/sammo/Command/General/che_등용수락.php index 98f903fd..653e0c6f 100644 --- a/hwe/sammo/Command/General/che_등용수락.php +++ b/hwe/sammo/Command/General/che_등용수락.php @@ -34,7 +34,7 @@ class che_등용수락 extends Command\GeneralCommand{ if($this->arg === null){ return false; } - //NOTE: 사망 직전에 '등용' 턴을 넣을 수 있으므로, 존재하지 않는 장수여도 argTest에서 바로 탈락시키지 않음 + if(!key_exists('destGeneralID', $this->arg)){ return false; } @@ -48,8 +48,24 @@ class che_등용수락 extends Command\GeneralCommand{ if($destGeneralID == $this->generalObj->getID()){ return false; } + + if(!key_exists('destNationID', $this->arg)){ + return false; + } + $destNationID = $this->arg['destNationID']; + if(!is_int($destNationID)){ + return false; + } + if($destNationID <= 0){ + return false; + } + if($destNationID == $this->generalObj->getNationID()){ + return false; + } + $this->arg = [ - 'destGeneralID'=>$destGeneralID + 'destGeneralID'=>$destGeneralID, + 'destNationID'=>$destNationID, ]; return true; }