From 7ec0cbb43c9d4c3d1e73740918839717fc75544b Mon Sep 17 00:00:00 2001 From: hide_d Date: Wed, 28 Nov 2018 00:14:36 +0900 Subject: [PATCH] =?UTF-8?q?=ED=86=B5=ED=95=A9,=20=ED=95=A9=EB=B3=91?= =?UTF-8?q?=EC=8B=9C=20=EB=B6=80=EB=8C=80=EC=9E=A5=EA=B9=8C=EC=A7=80=20?= =?UTF-8?q?=EA=B0=99=EC=9D=B4=20=ED=8F=AC=ED=95=A8=EB=90=98=EB=8A=94=20?= =?UTF-8?q?=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/func_gamerule.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/hwe/func_gamerule.php b/hwe/func_gamerule.php index 6c6a37dd..675364cb 100644 --- a/hwe/func_gamerule.php +++ b/hwe/func_gamerule.php @@ -787,6 +787,10 @@ function checkMerge() { 'data'=>Json::encode($oldNation) ]); + $db->update('general', [ + 'nation'=>0, + ], 'nation=%i AND npc = 5', $me['nation']); + $query = "delete from nation where nation='{$me['nation']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $db->delete('nation_turn', 'nation_id=%i', $me['nation']); @@ -940,6 +944,10 @@ function checkSurrender() { 'data'=>Json::encode($oldNation) ]); + $db->update('general', [ + 'nation'=>0, + ], 'nation=%i AND npc = 5', $me['nation']); + $query = "delete from nation where nation='{$me['nation']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $db->delete('nation_turn', 'nation_id=%i', $me['nation']);