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

data/mini/functions/hotpm/pm_boom.mcfunction

@@ -1,7 +1,7 @@
 #玩家失败
 function mini:hotpm/pm_lost
 # 告知玩家
-tellraw @a [{"text":">> ","color":"gold","bold": true},{"selector":"@s","color":"yellow","bold": false},{"text":"爆炸了！","color":"white","bold": false}]
+tellraw @a [{"text":">> ","color":"gold","bold": true},{"selector":"@s","color":"yellow","bold": false},{"text":" 爆炸了！","color":"white","bold": false}]
 #记录位置
 execute at @s run summon minecraft:area_effect_cloud ~ ~ ~ {Tags:["pm_boom"]}
 #减少生命

data/mini/functions/hotpm/pm_init.mcfunction

@@ -7,9 +7,9 @@ tellraw @a [{"text":">> ","color":"gold","bold": true},{"selector":"@a[tag=pm_ho
 # 强制观战
 execute at @s as @a[gamemode=spectator,distance=..0.1] run spectate @p[tag=pm_hoding]
 
-# 土豆爆炸时间 = 5 * (存活人数 + 1)
-scoreboard players set $countdown mem 5
-execute as @a[tag=mini_running] run scoreboard players add $countdown mem 5
+# 土豆爆炸时间 = 4 * 存活人数
+scoreboard players set $countdown mem 0
+execute as @a[tag=mini_running] run scoreboard players add $countdown mem 4
 
 # 删除效果云
 kill @s[type=area_effect_cloud,tag=pm_boom]

data/mini/functions/tntrun/tick4.mcfunction

@@ -1,2 +1,4 @@
 # 玩家死亡判断
 execute as @a[tag=tntrun_pc] at @s if block ~ ~ ~ lava run function mini:tntrun/player_failed
+execute as @a[tag=tntrun_pc] at @s if block ~ ~-1 ~ lava run function mini:tntrun/player_failed
+execute as @a[tag=tntrun_pc] at @s if block ~ ~-2 ~ lava run function mini:tntrun/player_failed