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

data/ltw/functions/clock/tick1.mcfunction

@@ -3,6 +3,3 @@
 # 调用其他模块
 execute if score $state mem matches 5 run function ltw:state/5/tick1
 
-# 死亡触发
-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/clock/tick2.mcfunction

@@ -23,4 +23,8 @@ function item:tick2
 
 # 全局倒计时
 execute if score $countdown_fast mem matches 1.. run scoreboard players remove $countdown_fast mem 1
-scoreboard players remove @e[scores={countdown_fast=1..}] countdown_fast 1
+scoreboard players remove @e[scores={countdown_fast=1..}] countdown_fast 1
+
+# 死亡触发
+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/mini/functions/diamond/player_death.mcfunction

@@ -7,7 +7,7 @@ effect give @s blindness 3 0 true
 
 # 处理玩家掉落物品
 execute at @s as @e[type=item,distance=..100] store result score @s temp run data get entity @s Age
-execute at @s store result score #total_drop temp run tag @e[type=item,scores={temp=..3}] add death_drop
+execute at @s store result score #total_drop temp run tag @e[type=item,scores={temp=..5}] add death_drop
 execute as @e[type=item,tag=death_drop] run data modify entity @s Invulnerable set value 1b
 scoreboard players reset @e[type=item] temp
 # 单独处理钻石还没写