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

data/item/functions/shop/summon_emerald.mcfunction

@@ -3,6 +3,7 @@ summon item ~ ~ ~ {Item:{id:"emerald",Count:1b,tag:{stats_item:1b}},Tags:["score
 execute if score @s temp matches 1..64 store result entity @e[type=item,tag=score_item,limit=1] Item.Count byte 1 run scoreboard players get @s temp
 execute if score @s temp matches 65.. run data modify entity @e[type=item,tag=score_item,limit=1] Item.Count set value 64b 
 data modify entity @e[type=item,tag=score_item,limit=1] Owner set from entity @s UUID
+data modify entity @e[type=item,tag=score_item,limit=1] Thrower set from entity @s UUID
 tag @e[type=item,tag=score_item] remove score_item
 scoreboard players remove @s temp 64
 execute if score @s temp matches 1.. run function item:shop/summon_emerald

data/item/functions/shop/summon_emerald_block.mcfunction

@@ -3,6 +3,7 @@ summon item ~ ~ ~ {Item:{id:"emerald_block",Count:1b,tag:{stats_item:1b}},Tags:[
 execute if score @s temp matches 1..64 store result entity @e[type=item,tag=score_item,limit=1] Item.Count byte 1 run scoreboard players get @s temp
 execute if score @s temp matches 65.. run data modify entity @e[type=item,tag=score_item,limit=1] Item.Count set value 64b 
 data modify entity @e[type=item,tag=score_item,limit=1] Owner set from entity @s UUID
+data modify entity @e[type=item,tag=score_item,limit=1] Thrower set from entity @s UUID
 tag @e[type=item,tag=score_item] remove score_item
 scoreboard players remove @s temp 64
 execute if score @s temp matches 1.. run function item:shop/summon_emerald_block

data/item/functions/shop/summon_gold.mcfunction

@@ -3,6 +3,7 @@ summon item ~ ~ ~ {Item:{id:"gold_ingot",Count:1b,tag:{stats_item:1b}},Tags:["sc
 execute if score @s temp matches 1..64 store result entity @e[type=item,tag=score_item,limit=1] Item.Count byte 1 run scoreboard players get @s temp
 execute if score @s temp matches 65.. run data modify entity @e[type=item,tag=score_item,limit=1] Item.Count set value 64b 
 data modify entity @e[type=item,tag=score_item,limit=1] Owner set from entity @s UUID
+data modify entity @e[type=item,tag=score_item,limit=1] Thrower set from entity @s UUID
 tag @e[type=item,tag=score_item] remove score_item
 scoreboard players remove @s temp 64
 execute if score @s temp matches 1.. run function item:shop/summon_gold

data/item/functions/shop/summon_gold_block.mcfunction

@@ -3,6 +3,7 @@ summon item ~ ~ ~ {Item:{id:"gold_block",Count:1b,tag:{stats_item:1b}},Tags:["sc
 execute if score @s temp matches 1..64 store result entity @e[type=item,tag=score_item,limit=1] Item.Count byte 1 run scoreboard players get @s temp
 execute if score @s temp matches 65.. run data modify entity @e[type=item,tag=score_item,limit=1] Item.Count set value 64b 
 data modify entity @e[type=item,tag=score_item,limit=1] Owner set from entity @s UUID
+data modify entity @e[type=item,tag=score_item,limit=1] Thrower set from entity @s UUID
 tag @e[type=item,tag=score_item] remove score_item
 scoreboard players remove @s temp 64
 execute if score @s temp matches 1.. run function item:shop/summon_gold_block

data/item/functions/shop/summon_nugget.mcfunction

@@ -3,6 +3,7 @@ summon item ~ ~ ~ {Item:{id:"gold_nugget",Count:1b,tag:{stats_item:1b}},Tags:["s
 execute if score @s temp matches 1..64 store result entity @e[type=item,tag=score_item,limit=1] Item.Count byte 1 run scoreboard players get @s temp
 execute if score @s temp matches 65.. run data modify entity @e[type=item,tag=score_item,limit=1] Item.Count set value 64b 
 data modify entity @e[type=item,tag=score_item,limit=1] Owner set from entity @s UUID
+data modify entity @e[type=item,tag=score_item,limit=1] Thrower set from entity @s UUID
 tag @e[type=item,tag=score_item] remove score_item
 scoreboard players remove @s temp 64
 execute if score @s temp matches 1.. run function item:shop/summon_nugget

data/ltw/functions/state/0/tick2.mcfunction

@@ -1,6 +1,6 @@
 # 处理乱扔物品的玩家
-execute as @e[type=item,nbt={Item:{tag:{stats_item:1b}}},tag=!new_stats] at @s run tag @a[distance=..2] add refresh
-execute as @e[type=item,nbt={Item:{tag:{stats_item:1b}}},tag=!new_stats] run kill @s
+execute as @e[type=item,nbt={Item:{tag:{stats_item:1b}}},tag=!new_stats] unless data entity @s Thrower at @s run tag @a[distance=..3] add refresh
+execute as @e[type=item,nbt={Item:{tag:{stats_item:1b}}},tag=!new_stats] unless data entity @s Thrower run kill @s
 execute as @a[tag=refresh] run function item:shop/refresh_gold
 execute as @a[tag=refresh] run function item:shop/refresh_green
 tag @a[tag=refresh] remove refresh

data/mini/functions/colormatch/watcher_limit.mcfunction

@@ -1,3 +1,3 @@
 # 观察者限定范围
-execute as @a[gamemode=spectator] unless entity @s[x=1049,y=10,z=3999,dx=26,dy=30,dz=26] run spectate
-execute as @a[gamemode=spectator] unless entity @s[x=1049,y=10,z=3999,dx=26,dy=30,dz=26] run tp @s[team=!debugging] 1062 22 4012
+execute as @a[gamemode=spectator] unless entity @s[x=1049,y=10,z=3999,dx=22,dy=31,dz=22] run spectate
+execute as @a[gamemode=spectator] unless entity @s[x=1049,y=10,z=3999,dx=22,dy=31,dz=22] run tp @s[team=!debugging] 1062 22 4012