devsam/core
3
6
Fork 1
Code Issues 60 Pull Requests Releases 1 Wiki Activity

통합, 합병시 부대장까지 같이 포함되는 문제 수정

Browse Source
This commit is contained in:
Hide_D
2019-04-07 19:58:38 +09:00
parent 6221ee164f
commit 1396f960b0
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/func_gamerule.php
+8
View File
@@ -787,6 +787,10 @@ function checkMerge() {
'data'=>Json::encode($oldNation) 'data'=>Json::encode($oldNation)
]); ]);
$db->update('general', [
'nation'=>0,
], 'nation=%i AND npc = 5', $me['nation']);
$query = "delete from nation where nation='{$me['nation']}'"; $query = "delete from nation where nation='{$me['nation']}'";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$db->delete('nation_turn', 'nation_id=%i', $me['nation']); $db->delete('nation_turn', 'nation_id=%i', $me['nation']);
@@ -940,6 +944,10 @@ function checkSurrender() {
'data'=>Json::encode($oldNation) 'data'=>Json::encode($oldNation)
]); ]);
$db->update('general', [
'nation'=>0,
], 'nation=%i AND npc = 5', $me['nation']);
$query = "delete from nation where nation='{$me['nation']}'"; $query = "delete from nation where nation='{$me['nation']}'";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$db->delete('nation_turn', 'nation_id=%i', $me['nation']); $db->delete('nation_turn', 'nation_id=%i', $me['nation']);