diff --git a/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/finger-guns/indicator/loop/laser/summon.mcfunction b/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/finger-guns/indicator/loop/laser/summon.mcfunction index 73afe26b5..0aff28a49 100644 --- a/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/finger-guns/indicator/loop/laser/summon.mcfunction +++ b/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/finger-guns/indicator/loop/laser/summon.mcfunction @@ -1,6 +1,5 @@ # Summon laser -# function animated_java:finger_gun_blinking_line/summon -$summon minecraft:item_display 0.5 34.5 $(z) { CustomName: '"Finger-Guns Blinking Line"', Tags:["omega-flowey-remastered","groupable","hostile","omega-flowey","attack","finger-guns","finger-guns-laser","finger-guns-laser-new"], interpolation_duration:1, item_display:"head", item:{id:"minecraft:red_wool",Count:1b}, Rotation: [90.0f, 0.0f] } +$execute positioned 0.5 33.5 $(z) run function animated_java:finger_gun_laser/summon # Copy group id to laser execute store result storage group id int 1 run scoreboard players get @s group.id diff --git a/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/finger-guns/indicator/loop/laser/terminate.mcfunction b/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/finger-guns/indicator/loop/laser/terminate.mcfunction index d31fc4a1f..b9e224bbb 100644 --- a/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/finger-guns/indicator/loop/laser/terminate.mcfunction +++ b/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/finger-guns/indicator/loop/laser/terminate.mcfunction @@ -1,4 +1,3 @@ function entity:group/start -# execute as @e[tag=finger-guns-laser,scores={group.id=0}] run function animated_java:homing_vine_blinking_line/remove/this -execute as @e[tag=finger-guns-laser,scores={group.id=0}] run kill @s +execute as @e[tag=finger-guns-laser,scores={group.id=0}] run function animated_java:finger_gun_laser/remove/this function entity:group/end