@@ -2,4 +2,6 @@
schedule function ltw:clock/tick4 4t replace
# 调用其他模块
-execute if score $state mem matches 5 run function ltw:state/5/tick4
+execute if score $state mem matches 4 run function ltw:state/4/tick4
+execute if score $state mem matches 5 run function ltw:state/5/tick4
+execute if score $state mem matches 6 run function ltw:state/6/tick4
@@ -0,0 +1 @@
+function mini:main/spectator_range
@@ -1 +1,2 @@
-function mini:main/tick4
+function mini:main/tick4
@@ -0,0 +1,2 @@
+# 限制观察者范围
+execute if score $mini_type mem matches 2 run function mini:tntrun/spectator_range
@@ -7,3 +7,6 @@ kill @e[tag=tntrun_block]
# 开启伤害
gamerule fallDamage true
gamerule fireDamage true
+
+# 清理玩家标签
+tag @a remove tntrun_pc
+# 观察者限制飞行范围
+execute as @a[gamemode=spectator] unless entity @s[x=1000,y=10,z=2000,dx=22,dz=22,dy=22] run tp @s 1011.5 27.5 2011.5
@@ -1,5 +1,2 @@
# 玩家死亡判断
execute as @a[tag=tntrun_pc] at @s if block ~ ~ ~ lava run function mini:tntrun/player_failed
-
-# 观察者限制飞行范围
-execute as @a[gamemode=spectator] unless entity @s[x=1000,y=10,z=2000,dx=22,dz=22,dy=22] run spectate @r[tag=tntrun_pc]