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

data/item/functions/bonus_item/give_items.mcfunction

@@ -3,7 +3,7 @@ setblock 0 0 1 jukebox replace
 data modify block 0 0 1 RecordItem set from block 0 0 0 RecordItem.tag.bonus_give_items[0]
 setblock 0 0 1 air destroy
 tag @s add item_op
-execute as @e[tag=!bonus_old,type=item,nbt={"Item":{"tag":{"is_bonus":1b}}},limit=1] run function item:bonus_item/tp
+execute as @e[tag=!bonus_old,tag=!item_new,type=item,nbt={"Item":{"tag":{"is_bonus":1b}}},limit=1] run function item:bonus_item/tp
 tag @s remove item_op
 data remove block 0 0 0 RecordItem.tag.bonus_give_items[0]
 execute if data block 0 0 0 RecordItem.tag.bonus_give_items[0] run function item:bonus_item/give_items

data/item/functions/bonus_item/rank/blue.mcfunction

@@ -5,4 +5,5 @@ data merge entity @e[distance=..1,limit=1,type=item] {Tags:["new_item"],Age:-327
 execute as @e[tag=new_item] run data modify entity @s CustomName set from entity @s Item.tag.item_name
 team join blue @e[tag=new_item]
 tag @e[tag=new_item] add item_blue
+tag @e[tag=new_item] add item_new
 tag @e[tag=new_item] remove new_item

data/item/functions/bonus_item/rank/green.mcfunction

@@ -5,4 +5,5 @@ data merge entity @e[distance=..1,limit=1,type=item] {Tags:["new_item"],Age:-327
 execute as @e[tag=new_item] run data modify entity @s CustomName set from entity @s Item.tag.item_name
 team join green @e[tag=new_item]
 tag @e[tag=new_item] add item_green
+tag @e[tag=new_item] add item_new
 tag @e[tag=new_item] remove new_item

data/item/functions/bonus_item/rank/purple.mcfunction

@@ -5,4 +5,5 @@ data merge entity @e[distance=..1,limit=1,type=item] {Tags:["new_item"],Age:-327
 execute as @e[tag=new_item] run data modify entity @s CustomName set from entity @s Item.tag.item_name
 team join purple @e[tag=new_item]
 tag @e[tag=new_item] add item_purple
+tag @e[tag=new_item] add item_new
 tag @e[tag=new_item] remove new_item

data/item/functions/bonus_item/rank/white.mcfunction

@@ -5,4 +5,5 @@ data merge entity @e[distance=..1,limit=1,type=item] {Tags:["new_item"],Age:-327
 execute as @e[tag=new_item] run data modify entity @s CustomName set from entity @s Item.tag.item_name
 team join white @e[tag=new_item]
 tag @e[tag=new_item] add item_white
+tag @e[tag=new_item] add item_new
 tag @e[tag=new_item] remove new_item

data/item/functions/bonus_item/return_item.mcfunction

@@ -3,5 +3,5 @@ data modify block 0 0 1 RecordItem set from block 0 0 0 RecordItem
 data modify block 0 0 1 RecordItem.tag.bonus_new set value 0b
 setblock 0 0 1 air destroy
 tag @s add item_op
-execute as @e[tag=!bonus_old,type=item,nbt={"Item":{"tag":{"is_bonus":1b,"bonus_new":0b}}},limit=1] run function item:bonus_item/tp
+execute as @e[tag=!bonus_old,tag=!item_new,type=item,nbt={"Item":{"tag":{"is_bonus":1b}}},limit=1] run function item:bonus_item/tp
 tag @s remove item_op

data/item/functions/bonus_item/tp.mcfunction

@@ -1,7 +1,6 @@
 #as item
 tp @s @a[tag=item_op,limit=1]
 tag @s add bonus_old
-tellraw @a ["退回了物品",{"selector": "@s"}]
 # 判断是否需要清除nbt tag
 execute if data entity @s Item.tag{"bonus_clear_nbt":true} run data remove entity @s Item.tag
 data modify entity @s PickupDelay set value 0