버그 수정

This commit is contained in:
2019-04-24 01:17:21 +09:00
parent dd81dcc9c6
commit 8aa846b349
29 changed files with 79 additions and 51 deletions
+3 -3
View File
@@ -1929,8 +1929,8 @@ function deleteNation(General $general) {
$josaUn = JosaUtil::pick($nationName, '은');
$logger->pushGlobalHistoryLog("<R><b>【멸망】</b></><D><b>{$nationName}</b></>{$josaUn} <R>멸망</>했습니다.");
$oldNation = $db->queryFirstRow('SELECT * FROM nation WHERE nation=%i', $general['nation']);
$oldNationGenerals = $db->queryFirstColumn('SELECT `no` FROM general WHERE nation=%i', $general['nation']);
$oldNation = $db->queryFirstRow('SELECT * FROM nation WHERE nation=%i', $nationID);
$oldNationGenerals = $db->queryFirstColumn('SELECT `no` FROM general WHERE nation=%i', $nationID);
$oldNation['generals'] = $oldNationGenerals;
$oldNation['aux'] = Json::decode($oldNation['aux']);
@@ -1963,7 +1963,7 @@ function deleteNation(General $general) {
$db->insert('ng_old_nations', [
'server_id'=>UniqueConst::$serverID,
'nation'=>$general['nation'],
'nation'=>$nationID,
'data'=>Json::encode($oldNation)
]);
$db->delete('nation', 'nation=%i', $nationID);