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

data/item/functions/disable_throw.mcfunction

@@ -5,7 +5,6 @@ data modify entity @s Owner set from entity @s Thrower
 
 # 将物品传送给与丢弃者 UUID 相同的玩家
 execute store result score @s UUID run data get entity @s Thrower[0]
-execute as @a if score @s UUID = @e[type=item,tag=item_force_tp,limit=1] UUID run tag @s add force_tp
-execute if entity @a[tag=force_tp,gamemode=spectator] run kill @s
-tp @s @a[tag=force_tp,limit=1]
-tag @a remove force_tp
+tag @s add item_force_tp
+execute as @a if score @s UUID = @e[type=item,tag=item_force_tp,limit=1] UUID run tp @e[type=item,tag=item_force_tp] @s
+tag @s remove item_force_tp

data/item/functions/tick2.mcfunction

@@ -6,7 +6,7 @@ execute if score $survival mem matches 1.. unless score $state mem matches 5 as
 execute as @a if data entity @s Inventory[{"tag":{"bonus_new":1b}}] run function item:bonus_item/call
 
 # 检测玩家格子锁定
-execute if score $state mem matches 1.. unless score $state mem matches 6 unless score $survival mem matches 1.. as @a[team=!debugging] run function item:disable_slot/check_slot
+execute if score $state mem matches 1.. unless score $survival mem matches 1.. as @a[team=!debugging] run function item:disable_slot/check_slot
 execute if score $state mem matches 0 as @a run function ltw:state/0/state/check_slot
 execute if score $state mem matches 0.. run kill @e[type=item,tag=LockTempItem]
 

data/mini/functions/diamond/game/respawn2.mcfunction

@@ -1,3 +1 @@
-execute as @e[type=item,tag=death_drop] run function item:disable_throw
-tag @e[type=item,tag=death_drop] remove death_drop
 tag @a remove respawning