Make trigger lobby work whenever it is enabled

NeunEinser · Apr 26, 2024 · b514449 · b514449
1 parent f56055e
commit b514449
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/datapack/data/fetchr/functions/game/player_tick.mcfunction b/datapack/data/fetchr/functions/game/player_tick.mcfunction
@@ -35,5 +35,3 @@ tag @s[tag=fetchr.position_changed] remove fetchr.check_inventory
 tag @s[tag=fetchr.only_check_inventory_once] remove fetchr.check_inventory
 tag @s[scores={fetchr.inv_change=1..}] add fetchr.check_inventory
 tag @s[scores={fetchr.inv_change=2..}] remove fetchr.only_check_inventory_once
-
-execute if entity @s[scores={fetchr.lobby=1}] run function fetchr:util/go_to_lobby
diff --git a/datapack/data/fetchr/functions/game/skybox/tick.mcfunction b/datapack/data/fetchr/functions/game/skybox/tick.mcfunction
@@ -64,5 +64,3 @@ particle minecraft:happy_villager ~ ~-3 ~ .125 1 .125 1 1 force
 scoreboard players set $card_frames.count fetchr.io 0
 execute positioned ~-2 ~-1 ~-7.49 as @e[type=minecraft:item_frame, tag=fetchr.card_frame, dx=5, dy=5, dz=.1] at @s run function fetchr:card_frames/check_item
 execute if score $card_frames.count fetchr.io matches ..24 run function fetchr:card_frames/spawn
-
-execute as @a[scores={fetchr.lobby=1}] run function fetchr:util/go_to_lobby
diff --git a/datapack/data/fetchr/functions/tick/player_tick.mcfunction b/datapack/data/fetchr/functions/tick/player_tick.mcfunction
@@ -5,7 +5,6 @@
 # @within function fetchr:tick/tick
 # @context entity Player
 
-
 #>
 # @within function fetchr:tick/*
 #declare storage tmp.fetchr:tick
@@ -92,6 +91,8 @@ execute if entity @s[predicate=!fetchr:is_in_overworld] in fetchr:lobby run func
 execute if entity @s[scores={fetchr.reveal_card=1}] in fetchr:lobby run function fetchr:game/reveal_card_operator_check
 
 # End
+execute if entity @s[scores={fetchr.lobby=1}] run function fetchr:util/go_to_lobby
+
 scoreboard players operation @s fetchr.prev_x_pos = $tick/player.x fetchr.tmp
 scoreboard players operation @s fetchr.prev_y_pos = $tick/player.y fetchr.tmp
 scoreboard players operation @s fetchr.prev_z_pos = $tick/player.z fetchr.tmp