Prevent being killed by worldborder when a player is in the tutorial

datapacks/Scaffolding Rush/data/scaffolding_rush/functions/player/death/trigger.mcfunction

@@ -6,15 +6,15 @@ execute as @a at @s run spawnpoint @s ~ ~ ~ ~
 # Exit world border -----------------------------------------------------------
 
 #check X
-execute unless score #game.loading data matches 1 as @a[tag=!player.is_dead,gamemode=!spectator] if score @s pos.x > WBbyTwo data run kill @s
-execute unless score #game.loading data matches 1 as @a[tag=!player.is_dead,gamemode=!spectator] if score @s pos.x < -WBbyTwo data run kill @s
+execute unless entity @a[tag=inTutorial] unless score #game.loading data matches 1 as @a[tag=!player.is_dead,gamemode=!spectator] if score @s pos.x > WBbyTwo data run kill @s
+execute unless entity @a[tag=inTutorial] unless score #game.loading data matches 1 as @a[tag=!player.is_dead,gamemode=!spectator] if score @s pos.x < -WBbyTwo data run kill @s
 
 #check Y
-execute unless score #game.loading data matches 1 as @a[tag=!player.is_dead,gamemode=!spectator] if score @s pos.y < 0 const run kill @s
+execute unless entity @a[tag=inTutorial] unless score #game.loading data matches 1 as @a[tag=!player.is_dead,gamemode=!spectator] if score @s pos.y < 0 const run kill @s
 
 #check Z
-execute unless score #game.loading data matches 1 as @a[tag=!player.is_dead,gamemode=!spectator] if score @s pos.z > WBbyTwo data run kill @s
-execute unless score #game.loading data matches 1 as @a[tag=!player.is_dead,gamemode=!spectator] if score @s pos.z < -WBbyTwo data run kill @s
+execute unless entity @a[tag=inTutorial] unless score #game.loading data matches 1 as @a[tag=!player.is_dead,gamemode=!spectator] if score @s pos.z > WBbyTwo data run kill @s
+execute unless entity @a[tag=inTutorial] unless score #game.loading data matches 1 as @a[tag=!player.is_dead,gamemode=!spectator] if score @s pos.z < -WBbyTwo data run kill @s
 
 
 # Check if player can respawn -------------------------------------------------

datapacks/Scaffolding Rush/data/scaffolding_rush/functions/tutorial/leave.mcfunction

@@ -5,6 +5,10 @@ execute as @e[type=marker,tag=TutorialCellClear] at @s run function scaffolding_
 
 function scaffolding_rush:player/join/lobby
 
+scoreboard players set @s pos.x 0
+scoreboard players set @s pos.y 24
+scoreboard players set @s pos.z 0
+
 tag @s remove TutorialMessage1
 tag @s remove TutorialMessage2
 tag @s remove TutorialMessage3