Pārlūkot izejas kodu

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

LTCatt 6 gadi atpakaļ
vecāks
revīzija
ccfc316e3a

+ 5 - 1
data/mini/functions/colormatch/tick2.mcfunction

@@ -1,8 +1,12 @@
 
+# 检测玩家死亡
+execute as @a[tag=mini_running] at @s if block ~ ~-1 ~ magma_block run function mini:colormatch/player_lose_heart
+execute as @a[tag=mini_running] at @s if block ~ ~-2 ~ magma_block run function mini:colormatch/player_lose_heart
+
 # 开始新的一轮
 execute if score $countdown_fast mem matches 0 if score $color_match_type mem matches 0 run function mini:colormatch/game/remove_ground
 execute if score $countdown_fast mem matches 0 if score $color_match_type mem matches 1 run function mini:colormatch/game/start_new_round
 
 # 显示当前剩余秒数
 execute if score $countdown_fast mem matches 1.. if score $color_match_type mem matches 0 run title @a actionbar [{"text":"地板消失: ","color":"red","bold": true},{"score": { "name": "$countdown_fast","objective": "mem"}}]
-execute if score $countdown_fast mem matches 1.. if score $color_match_type mem matches 1 run title @a actionbar [{"text":"下一轮: ","color":"green","bold": true},{"score": { "name": "$countdown_fast","objective": "mem"}}]
+execute if score $countdown_fast mem matches 1.. if score $color_match_type mem matches 1 run title @a actionbar [{"text":"下一轮: ","color":"green","bold": true},{"score": { "name": "$countdown_fast","objective": "mem"}}]

+ 0 - 1
data/mini/functions/colormatch/tick5.mcfunction

@@ -1 +0,0 @@
-execute as @a[tag=mini_running] at @s if block ~ ~-1 ~ magma_block run function mini:colormatch/player_lose_heart

+ 0 - 1
data/mini/functions/main/tick5.mcfunction

@@ -3,7 +3,6 @@
 execute if score $mini_type mem matches 1 run function mini:parkour/tick5
 execute if score $mini_type mem matches 2 run function mini:tntrun/tick5
 execute if score $mini_type mem matches 3 run function mini:hotpm/tick5
-execute if score $mini_type mem matches 4 run function mini:colormatch/tick5
 
 # 同步生命值
 scoreboard players reset * health_disp