Merge branch 'master' of https://github.com/LTCatt/LTW3

data/ltw/functions/clock/tick1.mcfunction

@@ -4,4 +4,5 @@
 execute if score $state mem matches 5 run function ltw:state/5/tick1
 
 # 死亡触发
-execute as @a[scores={death=1..}] at @s run function ltw:main/player_death
+execute as @a[tag=temp_death] at @s run function ltw:main/player_death
+execute as @a[scores={death=1..,health=1..}] run tag @s add temp_death

data/ltw/functions/main/player_death.mcfunction

@@ -1,4 +1,5 @@
 # 当玩家死亡后触发
 scoreboard players reset @s death
-
+tag @s remove temp_death
+say DEBUG: 触发ltw:main/player_death
 execute if score $state mem matches 5 run function ltw:state/5/player_death

data/ltw/functions/state/5/player_death.mcfunction

@@ -1 +1,2 @@
+say DEBUG: ltw:state/5/player_death
 function mini:main/player_death

data/mini/functions/diamond/player_death.mcfunction

@@ -1,4 +1,4 @@
-
+say DEBUG: 触发mini:diamond/player_death
 # 执行重生方法
 function mini:diamond/game/respawn1
 

data/mini/functions/main/player_death.mcfunction

@@ -1,3 +1,4 @@
 # 玩家死亡后触发
+say DEBUG: 触发mini:main/player_death
 execute if score $mini_type mem matches 5 run function mini:phantom/player_failed
 execute if score $mini_type mem matches 6 run function mini:diamond/player_death