修改选奖励判定

data/ltw/functions/main/player_enter.mcfunction

@@ -37,7 +37,6 @@ function lib:bossbar/show
 # FIXME: {钻石} 玩家会列入钻石的记分板（由于在 belowName 里显示）
 
 # HIM
-# FIXME: 锁格子依旧会吞物品
 
 
 # ——————————————

data/ltw/functions/state/7/next.mcfunction

@@ -3,16 +3,16 @@
 tag @a remove new_selector
 
 execute unless entity @a[tag=new_selector] run tag @a[tag=mini_rank1] add new_selector
-execute if entity @a[tag=mini_rank1] run tellraw @a[tag=!new_selector] ["",{"text": ">> ","color":"gold","bold": true},"轮到第一名 ",{"selector": "@a[tag=new_selector]","color":"gold"}," 选择奖励了!"]
+execute if entity @a[tag=mini_rank1,tag=new_selector] run tellraw @a[tag=!new_selector] ["",{"text": ">> ","color":"gold","bold": true},"轮到第一名 ",{"selector": "@a[tag=new_selector]","color":"gold"}," 选择奖励了!"]
 
 execute unless entity @a[tag=new_selector] run tag @a[tag=mini_rank2] add new_selector
-execute unless entity @a[tag=mini_rank1] if entity @a[tag=mini_rank2] run tellraw @a[tag=!new_selector] ["",{"text": ">> ","color":"gold","bold": true},"轮到第二名 ",{"selector": "@a[tag=new_selector]","color":"gold"}," 选择奖励了!"]
+execute if entity @a[tag=mini_rank2,tag=new_selector] run tellraw @a[tag=!new_selector] ["",{"text": ">> ","color":"gold","bold": true},"轮到第二名 ",{"selector": "@a[tag=new_selector]","color":"gold"}," 选择奖励了!"]
 
 execute unless entity @a[tag=new_selector] run tag @a[tag=mini_rank3] add new_selector
-execute unless entity @a[tag=mini_rank1] unless entity @a[tag=mini_rank2] if entity @a[tag=mini_rank3] run tellraw @a[tag=!new_selector] ["",{"text": ">> ","color":"gold","bold": true},"轮到第三名 ",{"selector": "@a[tag=new_selector]","color":"gold"}," 选择奖励了!"]
+execute if entity @a[tag=mini_rank3,tag=new_selector] run tellraw @a[tag=!new_selector] ["",{"text": ">> ","color":"gold","bold": true},"轮到第三名 ",{"selector": "@a[tag=new_selector]","color":"gold"}," 选择奖励了!"]
 
 execute unless entity @a[tag=new_selector] run tag @a[tag=mini_rank4] add new_selector
-execute unless entity @a[tag=mini_rank1] unless entity @a[tag=mini_rank2] unless entity @a[tag=mini_rank3] if entity @a[tag=mini_rank4] run tellraw @a[tag=!new_selector] ["",{"text": ">> ","color":"gold","bold": true},{"text":"轮到其他人选择奖励了!","color":"gold"}]
+execute if entity @a[tag=mini_rank4,tag=new_selector] run tellraw @a[tag=!new_selector] ["",{"text": ">> ","color":"gold","bold": true},{"text":"轮到其他人选择奖励了!","color":"gold"}]
 
 execute unless entity @a[tag=new_selector] if entity @a[tag=selecting] run tellraw @a ["",{"text": ">> ","color":"red","bold": true},{"selector": "@a[tag=selecting]","color":"red"}," 未选择奖励……"]
 

data/ltw/functions/state/7/pickup.mcfunction

@@ -1,5 +1,4 @@
 # 当玩家捡起物品时触发
-
-gamemode spectator
+gamemode spectator @s
 tag @s remove selecting
 execute unless entity @a[tag=selecting] run function ltw:state/7/next

data/ltw/functions/state/7/tick20.mcfunction

@@ -1,6 +1,6 @@
 
 # 下一状态
-execute if score $countdown mem matches 1 run function ltw:state/7/next
+execute if score $countdown mem matches 0 run function ltw:state/7/next
 
 # 显示倒计时
 execute if entity @a[tag=selecting] run title @a times 3 14 2