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

data/mini/functions/hotpm/pm_boom.mcfunction

@@ -1,9 +1,8 @@
 #玩家失败
 function mini:hotpm/pm_lost
 #记录位置
-execute at @s run summon minecraft:area_effect_cloud ~ ~ ~ {Tags:["pm_boom"],Age: -2147483648, Duration: -1, WaitTime: -2147483648}
+execute at @s run summon minecraft:area_effect_cloud ~ ~ ~ {Tags:["pm_boom"]}
 #去除tag
 function mini:hotpm/player_failed
 #选新土豆
 execute if score $t_alive mem matches 2.. as @e[type=area_effect_cloud,tag=pm_boom] run function mini:hotpm/pm_init
-

data/mini/functions/hotpm/pm_init.mcfunction

@@ -1,5 +1,5 @@
 # 将土豆刷新给离自己最远的人
-execute at @s as @a[sort=furthest,tag=mini_running,limit=1] run function mini:hotpm/pm_get
+execute at @s as @a[sort=furthest,tag=mini_running,tag=!watcher,limit=1] run function mini:hotpm/pm_get
 
 # 告知玩家
 tellraw @a [{"text":">> ","color":"gold","bold": true},{"selector":"@a[tag=pm_hoding]","color":"yellow","bold":false},{"text":" 获得了土豆！","color":"white","bold":false}]
@@ -9,4 +9,4 @@ scoreboard players set $countdown mem 5
 execute as @a[tag=mini_running] run scoreboard players add $countdown mem 5
 
 # 删除效果云
-kill @s
+kill @s[type=area_effect_cloud,tag=pm_boom]