HerobrineXia 5 лет назад
Родитель
Сommit
f4162fd1da

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

@@ -1,6 +1,2 @@
 # 当前游戏结束时触发
-forceload remove 1001 4000 1075 4025
-
-# 清理锁定格子
-execute as @a[team=!debugging] run function item:disable_slot/disable_slot_7
-execute as @a[team=!debugging] run function item:disable_slot/disable_slot_8
+forceload remove 1001 4000 1075 4025

+ 3 - 0
data/mini/functions/main/game_end.mcfunction

@@ -34,5 +34,8 @@ execute if score $mini_type mem matches 3 run advancement grant @a[tag=mini_rank
 execute if score $mini_type mem matches 3 run advancement grant @a[tag=mini_rank1,scores={mini_heart=5..}] only ltw:vs/potato3
 execute if score $mini_type mem matches 4 if score $color_match_time mem matches ..13 run advancement grant @a[tag=mini_rank1] only ltw:parkour/colormatch2
 
+# 清理怪东西
+clear @a[team=!debugging] #mini:game_item{game_item:1b}
+
 # 进入状态 6
 function ltw:state/6/state_enter

+ 1 - 5
data/mini/functions/phantom/game_end.mcfunction

@@ -3,8 +3,4 @@ forceload remove 1000 6000 1064 6064
 gamerule doDaylightCycle false
 
 # 计算得分
-execute as @a[team=playing] run scoreboard players operation @s mini_score = @s kill_phantom
-
-# 清理锁定格子
-execute as @a[team=!debugging] run function item:disable_slot/disable_slot_7
-execute as @a[team=!debugging] run function item:disable_slot/disable_slot_8
+execute as @a[team=playing] run scoreboard players operation @s mini_score = @s kill_phantom