diamond bug fix

data/mini/functions/colormatch/game_init.mcfunction

@@ -13,6 +13,7 @@ fill 1074 40 4000 1050 40 4024 barrier
 
 # 初始化
 scoreboard players set $finish_mode mem 0
+scoreboard players set $survival mem 0
 scoreboard players set $color_match_time mem 60
 scoreboard players set $color_match_type mem 0
 

data/mini/functions/colormatch/game_start.mcfunction

@@ -1,7 +1,7 @@
 # HUD
-execute if score $mini_type mem matches 4 run scoreboard objectives setdisplay list mini_heart_disp
-execute if score $mini_type mem matches 4 run scoreboard objectives setdisplay belowName mini_heart
-execute if score $mini_type mem matches 4 run scoreboard objectives setdisplay sidebar total_score
+scoreboard objectives setdisplay list mini_heart_disp
+scoreboard objectives setdisplay belowName mini_heart
+scoreboard objectives setdisplay sidebar total_score
 scoreboard players set $bossbar_type mem 0
 function lib:bossbar/show
 

data/mini/functions/diamond/game_end.mcfunction

@@ -5,6 +5,7 @@ forceload remove 1000 5000 1064 5064
 gamerule doDaylightCycle false
 gamerule doLimitedCrafting true
 gamerule keepInventory true
+gamerule doTileDrops false
 
 # 计算得分
 execute as @a[team=playing] run scoreboard players operation @s mini_score += @s diamond

data/mini/functions/diamond/game_init.mcfunction

@@ -3,9 +3,10 @@ forceload add 1000 5000 1064 5064
 
 scoreboard players reset * diamond
 scoreboard players set $finish_mode mem 0
+scoreboard players set $survival mem 1
 
 # 调整时间
-time set 9400t
+time set 9500t
 
 # 生成地图
 setblock 1000 255 5000 minecraft:structure_block[mode=load]{metadata:"",mirror:"NONE",ignoreEntities:1b,powered:0b,seed:0L,author:"LTCat",rotation:"NONE",posX:0,mode:"LOAD",posY:-22,sizeX:20,posZ:0,integrity:1.0f,showair:0b,name:"mini:diamond",sizeY:23,sizeZ:20,showboundingbox:1b}
@@ -24,3 +25,4 @@ gamerule fallDamage true
 # TODO: 换一个更好的让玩家合成的方法
 gamerule doLimitedCrafting false
 gamerule keepInventory false
+gamerule doTileDrops true

data/mini/functions/diamond/game_start.mcfunction

@@ -2,9 +2,9 @@ gamerule doDaylightCycle true
 scoreboard players set $countdown mem 300
 
 # HUD
-execute if score $mini_type mem matches 5 run scoreboard objectives setdisplay list health_disp
-execute if score $mini_type mem matches 5 run scoreboard objectives setdisplay belowName diamond
-execute if score $mini_type mem matches 5 run scoreboard objectives setdisplay sidebar diamond
+scoreboard objectives setdisplay list health_disp
+scoreboard objectives setdisplay belowName diamond
+scoreboard objectives setdisplay sidebar diamond
 scoreboard players set $bossbar_color mem 4
 scoreboard players set $countdown_max mem 300
 scoreboard players set $bossbar_type mem 2

data/mini/functions/diamond/player_death.mcfunction

@@ -2,6 +2,8 @@
 # 状态效果
 effect clear @s
 effect give @s saturation 1000000 0 true
+effect give @s haste 1000000 1 true
+effect give @s glowing 1000000 0 true
 gamerule naturalRegeneration false
 
 # 复活特效

data/mini/functions/hotpm/game_init.mcfunction

@@ -2,6 +2,7 @@
 forceload add 1000 3000 1100 3100
 
 scoreboard players set $finish_mode mem 0
+scoreboard players set $survival mem 0
 
 # 伤害管理
 scoreboard players set $remove_resistance mem 0

data/mini/functions/hotpm/game_start.mcfunction

@@ -1,6 +1,6 @@
 # HUD
-execute if score $mini_type mem matches 3 run scoreboard objectives setdisplay list mini_heart_disp
-execute if score $mini_type mem matches 3 run scoreboard objectives setdisplay belowName mini_heart
-execute if score $mini_type mem matches 3 run scoreboard objectives setdisplay sidebar total_score
+scoreboard objectives setdisplay list mini_heart_disp
+scoreboard objectives setdisplay belowName mini_heart
+scoreboard objectives setdisplay sidebar total_score
 scoreboard players set $bossbar_type mem 0
 function lib:bossbar/show

data/mini/functions/parkour/game_init.mcfunction

@@ -5,6 +5,7 @@ scoreboard players reset * treasure
 scoreboard players set $finish_mode mem 1
 scoreboard players set $tempo_enable mem 1
 scoreboard players set $countdown_fast mem 0
+scoreboard players set $survival mem 0
 
 # 生成地图
 setblock 1000 4 1000 minecraft:structure_block[mode=load]{metadata:"",mirror:"NONE",ignoreEntities:1b,powered:0b,seed:0L,author:"00ll00",rotation:"NONE",posX:0,mode:"LOAD",posY:1,sizeX:32,posZ:0,integrity:1.0f,showair:0b,name:"mini:parkour0",sizeY:32,sizeZ:32,showboundingbox:0b}

data/mini/functions/parkour/game_start.mcfunction

@@ -2,9 +2,9 @@
 scoreboard players set $countdown mem 140
 
 # HUD
-execute if score $mini_type mem matches 1 run scoreboard objectives setdisplay list total_score_disp
-execute if score $mini_type mem matches 1 run scoreboard objectives setdisplay belowName total_score_disp
-execute if score $mini_type mem matches 1 run scoreboard objectives setdisplay sidebar treasure
+scoreboard objectives setdisplay list total_score_disp
+scoreboard objectives setdisplay belowName total_score_disp
+scoreboard objectives setdisplay sidebar treasure
 scoreboard players set $bossbar_color mem 4
 scoreboard players set $countdown_max mem 140
 scoreboard players set $bossbar_type mem 2

data/mini/functions/phantom/game_init.mcfunction

@@ -2,6 +2,7 @@
 forceload add 1000 6000 1064 6064
 
 scoreboard players set $finish_mode mem 0
+scoreboard players set $survival mem 0
 scoreboard players reset * kill_phantom
 scoreboard players reset * kill_phantom2
 

data/mini/functions/phantom/game_start.mcfunction

@@ -2,9 +2,9 @@ gamerule doDaylightCycle true
 scoreboard players set $countdown mem 110
 
 # HUD
-execute if score $mini_type mem matches 5 run scoreboard objectives setdisplay list health_disp
-execute if score $mini_type mem matches 5 run scoreboard objectives setdisplay belowName health_disp
-execute if score $mini_type mem matches 5 run scoreboard objectives setdisplay sidebar kill_phantom
+scoreboard objectives setdisplay list health_disp
+scoreboard objectives setdisplay belowName health_disp
+scoreboard objectives setdisplay sidebar kill_phantom
 scoreboard players set $bossbar_color mem 4
 scoreboard players set $countdown_max mem 110
 scoreboard players set $bossbar_type mem 2

data/mini/functions/tntrun/game_init.mcfunction

@@ -2,6 +2,7 @@
 forceload add 1000 2000 1050 2050
 
 scoreboard players set $finish_mode mem 0
+scoreboard players set $survival mem 0
 
 # 生成地图
 ##000

data/mini/functions/tntrun/game_start.mcfunction

@@ -5,8 +5,8 @@ schedule function mini:tntrun/player_enter2 1t replace
 schedule function mini:tntrun/player_enter3 2s replace
 
 # HUD
-execute if score $mini_type mem matches 2 run scoreboard objectives setdisplay list total_score_disp
-execute if score $mini_type mem matches 2 run scoreboard objectives setdisplay belowName total_score_disp
-execute if score $mini_type mem matches 2 run scoreboard objectives setdisplay sidebar layer
+scoreboard objectives setdisplay list total_score_disp
+scoreboard objectives setdisplay belowName total_score_disp
+scoreboard objectives setdisplay sidebar layer
 scoreboard players set $bossbar_type mem 0
 function lib:bossbar/show

data/test/functions/mini/diamond.mcfunction

@@ -1,5 +1,6 @@
 # 测试用：快速开始钻石风暴
 team join playing @a
+clear @a
 function ltw:state/0/start_game
 scoreboard players set $round mem 5
 scoreboard players set $mini_type mem 6