From e9ad855fd95155d410d6558713257d7ccac96787 Mon Sep 17 00:00:00 2001
From: Harvey_Husky <harvey_husky@foxmail.com>
Date: Sat, 5 Oct 2024 19:40:49 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=9C=A81.20.1=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC=E4=BF=AE=E6=94=B9/=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E5=88=86=E6=95=B0=E6=97=B6=E4=B8=8D=E4=BC=9A=E5=88=B7=E6=96=B0?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=AE=A1=E5=88=86=E6=9D=BF=EF=BC=9Bfix=20?=
 =?UTF-8?q?=E9=87=8D=E7=BD=AE=E5=88=86=E6=95=B0=E6=97=B6=E4=B8=8D=E4=BC=9A?=
 =?UTF-8?q?=E9=87=8D=E6=96=B0=E8=AE=A1=E7=AE=97=E6=80=BB=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scoreboard/assign/scoreboard/general.json     | 15 +++++++++++++++
 scripts/fzsd_score.sc                             |  2 ++
 2 files changed, 17 insertions(+)
 create mode 100644 data/fzsd/tags/functions/module/scoreboard/assign/scoreboard/general.json

diff --git a/data/fzsd/tags/functions/module/scoreboard/assign/scoreboard/general.json b/data/fzsd/tags/functions/module/scoreboard/assign/scoreboard/general.json
new file mode 100644
index 0000000..f29ee51
--- /dev/null
+++ b/data/fzsd/tags/functions/module/scoreboard/assign/scoreboard/general.json
@@ -0,0 +1,15 @@
+{
+    "replace": false,
+    "values": [
+        "#fzsd:module/scoreboard/assign/scoreboard/general/activation",
+        "#fzsd:module/scoreboard/assign/scoreboard/general/aviating_distance",
+        "#fzsd:module/scoreboard/assign/scoreboard/general/bedrock_broke_count",
+        "#fzsd:module/scoreboard/assign/scoreboard/general/damage_taken",
+        "#fzsd:module/scoreboard/assign/scoreboard/general/death_count",
+        "#fzsd:module/scoreboard/assign/scoreboard/general/dig_count",
+        "#fzsd:module/scoreboard/assign/scoreboard/general/fishing_count",
+        "#fzsd:module/scoreboard/assign/scoreboard/general/kill_count",
+        "#fzsd:module/scoreboard/assign/scoreboard/general/placement_count",
+        "#fzsd:module/scoreboard/assign/scoreboard/general/trade_count"
+    ]
+}
\ No newline at end of file
diff --git a/scripts/fzsd_score.sc b/scripts/fzsd_score.sc
index 8bdaf1e..6dd06a8 100644
--- a/scripts/fzsd_score.sc
+++ b/scripts/fzsd_score.sc
@@ -257,10 +257,12 @@ help() -> (
 command_reset(player, scoreboard_id) -> (
     if(scoreboard_id == null,
         run('scoreboard players reset ' + player);
+        recalculate_general(null);
         print('已重置' + player + '的所有分数');
         return();
     );
     scoreboard_remove(scoreboard_id, player);
+    recalculate_general(scoreboard_id);
     print('已重置' + player + '的' + scoreboard_id + '分数');
 );