불가침 외교 커맨드 부활. 버그 수정

This commit is contained in:
2020-03-12 15:58:14 +09:00
parent 59f7448aa7
commit d1bc434ced
13 changed files with 440 additions and 88 deletions
-22
View File
@@ -272,28 +272,6 @@ class Diplomacy{
return $prev;
}
public function noAggression(int $when){
$chk = $this->checkValidNation();
$chk = $this->checkNotWar($chk);
$chk = $this->checkAlreadyMerging($chk);
list($result, $reason) = $chk;
if($result !== DiplomaticMessage::ACCEPTED){
return $chk;
}
$db = DB::db();
$db->update('diplomacy',[
'state'=>7,
'term'=>$when*12
],
'(me=%i AND you=%i) OR (you=%i AND me=%i)',
$this->srcNation['nation'], $this->destNation['nation'],
$this->srcNation['nation'], $this->destNation['nation']);
return $chk;
}
public function cancelNA(){
$chk = $this->checkValidNation();