LTCatt 5 лет назад
Родитель
Сommit
df7d93b895

+ 4 - 4
data/mini/functions/hotpm/player_enter.mcfunction

@@ -22,14 +22,14 @@ tag @s remove pm_explode_last
 
 
 # 传送玩家
-tp @s[team=!watching,tag=!rejoining,team=!debugging] 1023 25 3021
-# spreadplayers 1023 3021 5 5 false @s[team=!watching,tag=!rejoining,team=!debugging]
+tp @s[team=playing,tag=!rejoining] 1023 25 3021
+# spreadplayers 1023 3021 5 5 false @s[team=playing,tag=!rejoining]
 # schedule function mini:hotpm/player_enter2 1t replace
-# execute as @a[team=!watching,tag=!rejoining,team=!debugging] at @s run tp @s ~ 25 ~
+# execute as @a[team=playing,tag=!rejoining] at @s run tp @s ~ 25 ~
 
 # 调整模式
 gamemode spectator @s[team=!debugging]
-gamemode adventure @s[team=!watching,tag=!rejoining,team=!debugging]
+gamemode adventure @s[team=playing,tag=!rejoining]
 
 # 重新加入处理
 execute if entity @s[tag=rejoining] run function mini:main/player_failed

+ 4 - 4
data/mini/functions/parkour/player_enter.mcfunction

@@ -14,7 +14,7 @@ attribute @s generic.max_health base set 20
 
 # 计分板重置
 scoreboard players reset @s treasure
-scoreboard players set @s[team=!watching,tag=!rejoining,team=!debugging] treasure 0
+scoreboard players set @s[team=playing,tag=!rejoining] treasure 0
 tag @s remove treasure1
 tag @s remove treasure2
 tag @s remove treasure3
@@ -27,12 +27,12 @@ tag @s remove treasure9
 tag @s remove treasure10
 
 # 传送玩家
-spreadplayers 1018 1007 4 6 under 9 false @s[team=!watching,tag=!rejoining,team=!debugging]
-# tp @s[team=!watching,tag=!rejoining,team=!debugging] 1010.07 7.50 1006.98 -1518.69 -10.62
+spreadplayers 1018 1007 4 6 under 9 false @s[team=playing,tag=!rejoining]
+# tp @s[team=playing,tag=!rejoining] 1010.07 7.50 1006.98 -1518.69 -10.62
 
 # 调整模式
 gamemode spectator @s[team=!debugging]
-gamemode adventure @s[team=!watching,tag=!rejoining,team=!debugging]
+gamemode adventure @s[team=playing,tag=!rejoining]
 
 # 修改 Tag
 tag @s add parkour_portal

+ 3 - 3
data/mini/functions/phantom/player_enter.mcfunction

@@ -15,8 +15,8 @@ attribute @s generic.max_health base set 20
 # 计分板重置
 scoreboard players reset @s kill_phantom
 scoreboard players reset @s kill_phantom2
-scoreboard players set @s[team=!watching,tag=!rejoining,team=!debugging] kill_phantom 0
-scoreboard players set @s[team=!watching,tag=!rejoining,team=!debugging] kill_phantom2 0
+scoreboard players set @s[team=playing,tag=!rejoining] kill_phantom 0
+scoreboard players set @s[team=playing,tag=!rejoining] kill_phantom2 0
 scoreboard players reset @s use_trident
 scoreboard players reset @s countdown
 
@@ -25,7 +25,7 @@ tp @s[team=playing] 1030.5 24.5 6031.5
 
 # 调整模式
 gamemode spectator @s[team=!debugging]
-gamemode adventure @s[team=!watching,tag=!rejoining,team=!debugging]
+gamemode adventure @s[team=playing,tag=!rejoining]
 
 # 重新加入处理
 execute if entity @s[tag=rejoining] run gamemode spectator

+ 2 - 2
data/mini/functions/tntrun/player_enter.mcfunction

@@ -13,7 +13,7 @@ effect give @s resistance 1000000 4 true
 attribute @s generic.max_health base set 20
 
 # 传送玩家
-spreadplayers 1019.5 2020.5 2 2 false @s[team=!watching,tag=!rejoining,team=!debugging]
+spreadplayers 1019.5 2020.5 2 2 false @s[team=playing,tag=!rejoining]
 # schedule: tp @a ~ ~-3 ~
 
 # 两秒后才开始 TNT 掉落
@@ -22,7 +22,7 @@ tag @s remove tntrun_pc
 
 # 调整模式
 gamemode spectator @s[team=!debugging]
-gamemode adventure @s[team=!watching,tag=!rejoining,team=!debugging]
+gamemode adventure @s[team=playing,tag=!rejoining]
 
 # 重新加入处理
 execute if entity @s[tag=rejoining] run function mini:tntrun/player_failed

+ 1 - 1
data/test/functions/fast_countdown.mcfunction

@@ -1,5 +1,5 @@
 # 测试用:将倒计时修改为立即结束
 
-scoreboard players set #start_sec mem 1
+scoreboard players set #start_sec mem 3
 scoreboard players set $countdown mem 1
 scoreboard players set $countdown_fast mem 5