Merge branch 'master' of github.com:00ll00/LTW3

data/item/functions/bonus_item/add_score.mcfunction

@@ -22,7 +22,8 @@ function ltw:main/get_max_score
 tag @a remove highest
 tag @a remove may_highest
 execute as @a if score @s total_score = #score_max mem run tag @s add may_highest
-execute at @s run tag @a[tag=may_highest,limit=1,sort=furthest] add highest
+execute at @s run tag @a[tag=may_highest,limit=1,sort=furthest,scores={total_score=1..}] add highest
+execute unless entity @a[tag=highest] run tag @s add highest
 
 execute if score #bonus_add_score mem matches 200 run scoreboard players add @s total_score 1
 execute if score #bonus_add_score mem matches 200 run scoreboard players add @s total_score_disp 1

data/ltw/functions/main/player_enter.mcfunction

@@ -22,6 +22,4 @@ execute if entity @s[tag=!watcher] if score @s game_id = $ game_id run function
 bossbar set ltw:notice players @a
 function lib:bossbar/show
 
-# FIXME: [LTCat] 不再允许偷到 -1 分
-# FIXME: [LTCat] 旁观者在游戏开局的时候似乎会看到 2 然后 ding
-# FIXME: [HIM] init 之后猪灵可能会消失（并且会 ding 两声，疑似执行了两次
+# FIXME: [LTCat] 旁观者在游戏开局的时候似乎会看到 2 然后 ding

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

@@ -7,5 +7,6 @@ tag @s remove mini_rank4
 tag @s add selecting
 
 gamemode adventure
+tp @s 24.5 11.0 1967.5
 
-tellraw @s ["",{"text": ">> ","color":"green","bold": true},{"text":"轮到你选择奖励了!","color":"green"}]
+tellraw @s ["",{"text": ">> ","color":"green","bold": true},{"text":"轮到你选择奖励了!","color":"green"}]

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

@@ -1,3 +1,3 @@
 # 观察者限制
 execute as @a[gamemode=spectator] run spectate
-execute as @a[gamemode=spectator] run tp @s[tag=!debug] 24.5 11.0 1967.5
+execute as @a[gamemode=spectator] unless entity @s[x=12,y=9,z=1955,dx=24,dy=14,dz=24] run tp @s[tag=!debug] 24.5 12.0 1967.5