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

data/item/functions/tick2.mcfunction

@@ -7,7 +7,8 @@ execute as @a if data entity @s Inventory[{"tag":{"bonus_new":1b}}] run function
 
 # 检测玩家第九格锁定
 execute as @a unless data entity @s Inventory[{Slot:8b,tag:{GameItem:1b}}] unless data entity @s Inventory[{Slot:8b,tag:{LockItem:1b},Count:1b}] run function item:disable_slot
+execute as @a unless data entity @s Inventory[{Slot:8b,tag:{LockItem:1b},Count:1b}] if data entity @s Inventory[{tag:{LockItem:1b},Count:1b}] run clear @s red_dye{LockItem:1b}
 
 # 清除临时物品
 clear @a red_dye{LockTempItem:1b}
-kill @e[type=item,tag=LockTempItem]
+kill @e[type=item,tag=LockTempItem,nbt={Item:{tag:{LockTempItem:1b}}}]

data/ltw/functions/clock/tick2.mcfunction

@@ -2,7 +2,7 @@
 schedule function ltw:clock/tick2 2t replace
 
 # 调用其他模块
-function item:tick2
+execute if score $state mem matches 1.. run function item:tick2
 execute if score $state mem matches 3 run function ltw:state/3/tick2
 execute if score $state mem matches 4 run function ltw:state/4/tick2
 execute if score $state mem matches 5 run function ltw:state/5/tick2

data/ltw/functions/main/player_leave.mcfunction

@@ -9,6 +9,5 @@ execute if score $state mem matches 1.. if score $game_type mem matches 1 if sco
 # 如果携带热土豆的玩家掉线，则重新生成土豆
 execute if score $state mem matches 5 if score $mini_type mem matches 3 run function mini:hotpm/player_leave
 
-# TODO : 快捷栏最后一格固定为屏障，禁止使用，这样可以在部分小游戏中提供专用物品
 # TODO : 如果在熔炉中放入魔晶石（暂时用下界之星代替），则显示提示并且炸毁熔炉
 # TODO : 判断玩家背包中的魔晶石数量（暂时用下界之星代替），每一个魔晶石提供 -10% 速度和 +0.5 击退抗性