Fix Bookshelf Inspector not working in 1.20.4 (Gamemode4Dev#943)

EpyonProjects · Jan 22, 2024 · d0eb852 · d0eb852
1 parent 942c42b
commit d0eb852
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/...nspector/data/gm4_bookshelf_inspector/functions/process_display/remove/process.mcfunction b/...nspector/data/gm4_bookshelf_inspector/functions/process_display/remove/process.mcfunction
@@ -6,4 +6,5 @@
 scoreboard players add @s gm4_bookshelf_inspector_display_state 1
 
 execute if score @s gm4_bookshelf_inspector_display_state matches 6 run data merge entity @s {start_interpolation:-1,interpolation_duration:3,transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0f,0f],scale:[0f,0f,0f]}}
+execute unless score @s gm4_bookshelf_inspector_display_state matches 8 run scoreboard players set $keep_loop_active gm4_bookshelf_inspector_data 1
 execute if score @s gm4_bookshelf_inspector_display_state matches 8 run kill @s
diff --git a/...f_inspector/data/gm4_bookshelf_inspector/functions/process_display/remove/tick.mcfunction b/...f_inspector/data/gm4_bookshelf_inspector/functions/process_display/remove/tick.mcfunction
@@ -6,6 +6,6 @@
 
 scoreboard players set $keep_loop_active gm4_bookshelf_inspector_data 0
 
-execute as @e[type=text_display,tag=gm4_bookshelf_inspector_display.removing] store success score $keep_loop_active gm4_bookshelf_inspector_data run function gm4_bookshelf_inspector:process_display/remove/process
+execute as @e[type=text_display,tag=gm4_bookshelf_inspector_display.removing] run function gm4_bookshelf_inspector:process_display/remove/process
 
 execute if score $keep_loop_active gm4_bookshelf_inspector_data matches 1 run schedule function gm4_bookshelf_inspector:process_display/remove/tick 1t
diff --git a/...inspector/data/gm4_bookshelf_inspector/functions/process_display/spawn/process.mcfunction b/...inspector/data/gm4_bookshelf_inspector/functions/process_display/spawn/process.mcfunction
@@ -9,3 +9,5 @@ execute if score @s gm4_bookshelf_inspector_display_state matches 2 run data mer
 
 execute if score @s gm4_bookshelf_inspector_display_state matches 4 run tag @s add gm4_bookshelf_inspector_display.active
 execute if score @s gm4_bookshelf_inspector_display_state matches 4 run tag @s remove gm4_bookshelf_inspector_display.extending
+
+execute unless score @s gm4_bookshelf_inspector_display_state matches 4 run scoreboard players set $keep_loop_active gm4_bookshelf_inspector_data 1
diff --git a/...lf_inspector/data/gm4_bookshelf_inspector/functions/process_display/spawn/tick.mcfunction b/...lf_inspector/data/gm4_bookshelf_inspector/functions/process_display/spawn/tick.mcfunction
@@ -6,6 +6,6 @@
 
 scoreboard players set $keep_loop_active gm4_bookshelf_inspector_data 0
 
-execute as @e[type=text_display,tag=gm4_bookshelf_inspector_display.extending] store success score $keep_loop_active gm4_bookshelf_inspector_data run function gm4_bookshelf_inspector:process_display/spawn/process
+execute as @e[type=text_display,tag=gm4_bookshelf_inspector_display.extending] run function gm4_bookshelf_inspector:process_display/spawn/process
 
 execute if score $keep_loop_active gm4_bookshelf_inspector_data matches 1 run schedule function gm4_bookshelf_inspector:process_display/spawn/tick 1t
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,3 +9,5 @@ execute if score @s gm4_bookshelf_inspector_display_state matches 2 run data mer

		execute if score @s gm4_bookshelf_inspector_display_state matches 4 run tag @s add gm4_bookshelf_inspector_display.active
		execute if score @s gm4_bookshelf_inspector_display_state matches 4 run tag @s remove gm4_bookshelf_inspector_display.extending

		execute unless score @s gm4_bookshelf_inspector_display_state matches 4 run scoreboard players set $keep_loop_active gm4_bookshelf_inspector_data 1