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

data/mini/functions/main/tick2.mcfunction

@@ -1,4 +1,5 @@
 function mini:main/watcher_limit
+execute if score $mini_type mem matches 1 run function mini:parkour/tick2
 execute if score $mini_type mem matches 2 run function mini:tntrun/tick2
 execute if score $mini_type mem matches 3 run function mini:hotpm/tick2
 execute if score $mini_type mem matches 4 run function mini:colormatch/tick2

data/mini/functions/main/tick20.mcfunction

@@ -1,6 +1,5 @@
 
 # 触发单个模块
-execute if score $mini_type mem matches 1 run function mini:parkour/tick20
 execute if score $mini_type mem matches 5 run function mini:zombie/tick20
 
 # 结束游戏判定

data/mini/functions/parkour/game/tempo_block.mcfunction

@@ -8,6 +8,8 @@ execute if score $parkour_block mem matches 0 run setblock 1009 10 1036 air dest
 execute if score $parkour_block mem matches 0 run setblock 1010 10 1033 air destroy
 execute if score $parkour_block mem matches 0 run setblock 1013 10 1032 air destroy
 execute if score $parkour_block mem matches 0 run setblock 1010 12 1030 air destroy
+execute if score $parkour_block mem matches 1 run setblock 1009 16 1051 air destroy
+execute if score $parkour_block mem matches 1 run setblock 1004 17 1050 air destroy
 execute if score $parkour_block mem matches 0 run setblock 1009 9 1036 minecraft:warped_hyphae
 execute if score $parkour_block mem matches 0 run setblock 1013 9 1032 minecraft:warped_hyphae
 execute if score $parkour_block mem matches 0 run setblock 1010 11 1033 minecraft:warped_hyphae
@@ -23,3 +25,5 @@ execute if score $parkour_block mem matches 1 run setblock 1012 8 1035 minecraft
 execute if score $parkour_block mem matches 1 run setblock 1009 10 1036 minecraft:crimson_hyphae
 execute if score $parkour_block mem matches 1 run setblock 1010 10 1033 minecraft:crimson_hyphae
 execute if score $parkour_block mem matches 1 run setblock 1010 12 1030 minecraft:crimson_hyphae
+execute if score $parkour_block mem matches 1 run setblock 1009 16 1051 minecraft:crimson_hyphae
+execute if score $parkour_block mem matches 1 run setblock 1004 17 1050 minecraft:crimson_hyphae

data/mini/functions/parkour/tick2.mcfunction

@@ -1,2 +1,2 @@
 execute if score $countdown_fast mem matches 0 run function mini:parkour/game/tempo_block
-execute if score $countdown_fast mem matches 0 run scoreboard players set $countdown_fast mem 15
+execute unless score $countdown_fast mem matches 1.. run scoreboard players set $countdown_fast mem 15