*

data/mini/functions/colormatch/game_init.mcfunction

@@ -30,4 +30,5 @@ kill @e[type=trident]
 scoreboard players set $remove_resistance mem 0
 team modify playing friendlyFire true
 team modify playing collisionRule always
+team modify playing deathMessageVisibility never
 gamerule fallDamage false

data/mini/functions/diamond/game/clear_effect.mcfunction

@@ -0,0 +1 @@
+effect clear @a regeneration

data/mini/functions/diamond/game_init.mcfunction

@@ -19,6 +19,7 @@ kill @e[type=!player,x=950,y=0,z=4950,dx=100,dy=500,dz=100]
 scoreboard players set $remove_resistance mem 1
 team modify playing friendlyFire true
 team modify playing collisionRule always
+team modify playing deathMessageVisibility always
 gamerule fallDamage true
 
 # Gamerule 调整

data/mini/functions/diamond/player_death.mcfunction

@@ -1,4 +1,5 @@
 
+
 # 状态效果
 effect clear @s
 effect give @s saturation 1000000 0 true
@@ -6,8 +7,9 @@ effect give @s haste 1000000 1 true
 gamerule naturalRegeneration false
 
 # 复活特效
+execute as @a at @s run function lib:sounds/error
 effect give @s slowness 3 3 true
 effect give @s blindness 3 0 true
 
 # 传送玩家
-spreadplayers 1010 5010 6 9 under 245 false @s[team=playing,tag=!rejoining]
+spreadplayers 1010 5010 6 8 under 245 false @s[team=playing,tag=!rejoining]

data/mini/functions/diamond/player_enter.mcfunction

@@ -4,10 +4,11 @@ function lib:sounds/music/mini_slow
 title @s clear
 title @s actionbar ""
 
-# 触发复活
-function mini:diamond/player_death
-effect clear @s slowness
-effect clear @s blindness
+effect clear @s
+effect give @s saturation 1000000 0 true
+effect give @s haste 1000000 1 true
+gamerule naturalRegeneration false
+spreadplayers 1010 5010 6 8 under 245 false @s[team=playing,tag=!rejoining]
 
 # 设置玩家生命
 attribute @s generic.max_health base set 20

data/mini/functions/diamond/tick20.mcfunction

@@ -7,3 +7,8 @@ execute if score $countdown mem matches ..10 as @a at @s run function lib:sounds
 
 # 0s：游戏结束
 execute if score $countdown mem matches 0 run function mini:main/game_end
+
+# 回复生命值
+execute if score $twice mem matches 1 run effect give @a regeneration 1 10 true
+execute if score $twice mem matches 1 run schedule function mini:diamond/game/clear_effect 1t replace
+effect clear @a regeneration

data/mini/functions/diamond/tick5.mcfunction

@@ -4,6 +4,6 @@ execute as @a[team=playing] store result score @s diamond run clear @s diamond 0
 effect give @a[scores={diamond=1..}] glowing 2 0 true
 
 # 显示提示
-execute as @a[scores={diamond=1..},tag=!diamond_got] run tellraw @a ["",{"text": ">> ","color":"blue","bold": true},{"selector": "@s","color":"blue"}," 获得了闪闪发光的钻石!"]
+execute as @a[scores={diamond=1..},tag=!diamond_got] run tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"selector": "@s","color":"aqua"}," 获得了闪闪发光的钻石!"]
 execute as @a[scores={diamond=1..},tag=!diamond_got] as @a[distance=1..] run function lib:sounds/hit
 tag @a[scores={diamond=1..},tag=!diamond_got] add diamond_got

data/mini/functions/hotpm/game_init.mcfunction

@@ -8,6 +8,7 @@ scoreboard players set $survival mem 0
 scoreboard players set $remove_resistance mem 0
 team modify playing friendlyFire true
 team modify playing collisionRule always
+team modify playing deathMessageVisibility never
 gamerule fallDamage false
 
 # 清理残余实体

data/mini/functions/parkour/game_init.mcfunction

@@ -54,4 +54,5 @@ effect give @e[tag=treasure_item] glowing 1000000 0 true
 scoreboard players set $remove_resistance mem 0
 team modify playing friendlyFire false
 team modify playing collisionRule never
+team modify playing deathMessageVisibility never
 gamerule fallDamage false

data/mini/functions/phantom/game_init.mcfunction

@@ -37,4 +37,5 @@ execute positioned 1035.0 28.5 6002.5 run function item:bonus_item/gameparty/aut
 scoreboard players set $remove_resistance mem 1
 team modify playing friendlyFire false
 team modify playing collisionRule always
+team modify playing deathMessageVisibility always
 gamerule fallDamage false

data/mini/functions/phantom/player_failed.mcfunction

@@ -3,6 +3,6 @@
 tag @s remove mini_running
 gamemode spectator
 tp @s[team=!debugging] 1062.34 27.11 6040.84 461.44 28.30
-tellraw @a ["",{"text": ">> ","color":"red","bold": true},{"selector": "@s","color":"red"}," 已死亡!"]
+# tellraw @a ["",{"text": ">> ","color":"red","bold": true},{"selector": "@s","color":"red"}," 已死亡!"]
 execute as @a at @s run function lib:sounds/error
 execute unless entity @a[tag=mini_running] run function mini:main/game_end

data/mini/functions/tntrun/game_init.mcfunction

@@ -43,4 +43,5 @@ execute positioned 1019.5 19.2 2020.5 run function item:bonus_item/gameparty/aut
 scoreboard players set $remove_resistance mem 0
 team modify playing friendlyFire true
 team modify playing collisionRule always
+team modify playing deathMessageVisibility never
 gamerule fallDamage false