Fix skybox item frames not respawning

NeunEinser · Sep 9, 2023 · 9f60160 · 9f60160
1 parent da55e60
commit 9f60160
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/datapack/data/fetchr/functions/init/init.mcfunction b/datapack/data/fetchr/functions/init/init.mcfunction
@@ -1061,6 +1061,10 @@ forceload add 0 0
 		scoreboard players set 20 fetchr.const 20
 		#>
 		# @public
+		#declare score_holder 25
+		scoreboard players set 25 fetchr.const 25
+		#>
+		# @public
 		#declare score_holder 32
 		scoreboard players set 32 fetchr.const 32
 		#>

diff --git a/datapack/data/fetchr/functions/lobby/tick.mcfunction b/datapack/data/fetchr/functions/lobby/tick.mcfunction
@@ -23,7 +23,9 @@ execute as @e[type=minecraft:item_frame, tag=fetchr.card_frame, nbt=!{ItemRotati
 #
 # @private
 #declare score_holder $lobby/loop.frame_count
-execute store result score $lobby/loop.frame_count fetchr.tmp if entity @e[type=minecraft:item_frame, tag=fetchr.card_frame, distance=0..]
-execute unless score $lobby/loop.frame_count fetchr.tmp matches 25 run function fetchr:card_frames/spawn
+execute store result score $lobby/loop.frame_count fetchr.tmp if entity @e[type=minecraft:item_frame, tag=fetchr.card_frame]
+execute if score $lobby/loop.frame_count fetchr.tmp matches 0 run function fetchr:card_frames/spawn
+scoreboard players operation $lobby/loop.frame_count fetchr.tmp %= 25 fetchr.const
+execute unless score $lobby/loop.frame_count fetchr.tmp matches 0 run function fetchr:card_frames/spawn
 
 gamerule sendCommandFeedback true