*

data/item/functions/bonus_item/gameparty/wrap/all.mcfunction

@@ -1,4 +1,5 @@
-#as item
-tp @s ~ ~ ~
-data merge entity @s {Age:-32768,PickupDelay:0,NoGravity:1,Invulnerable:1,CustomNameVisible:1,Glowing:1,Motion:[0,0,0]}
-execute as @s run data modify entity @s CustomName set from entity @s Item.tag.item_name
+#as item at item generate position
+summon item ~ ~ ~ {Tags:["new_item_"],Age:-32768,PickupDelay:0,NoGravity:1,Invulnerable:1,CustomNameVisible:1,Glowing:1,Motion:[0,0,0],Item:{id:"minecraft:gold_nugget",Count:1}}
+data modify entity @e[tag=new_item_,limit=1] Item set from entity @s Item
+execute as @e[tag=new_item_] run data modify entity @s CustomName set from entity @s Item.tag.item_name
+kill @s

data/item/functions/bonus_item/gameparty/wrap/blue.mcfunction

@@ -1,5 +1,6 @@
 #as item
 function item:bonus_item/gameparty/wrap/all
-team join blue @s
-tag @s add item_blue
-tag @s add item_new
+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/gameparty/wrap/green.mcfunction

@@ -1,5 +1,6 @@
 #as item
 function item:bonus_item/gameparty/wrap/all
-team join green @s
-tag @s add item_green
-tag @s add item_new
+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/gameparty/wrap/purple.mcfunction

@@ -1,5 +1,6 @@
 #as item
 function item:bonus_item/gameparty/wrap/all
-team join purple @s
-tag @s add item_purple
-tag @s add item_new
+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/gameparty/wrap/white.mcfunction

@@ -1,5 +1,6 @@
 #as item
 function item:bonus_item/gameparty/wrap/all
-team join white @s
-tag @s add item_white
-tag @s add item_new
+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_