Merge branch 'dev' of https://github.com/Gunivers/Scaffolding-Rush in…

…to dev
Gunivers · Jan 22, 2024 · 0311205 · 0311205
2 parents 2f68868 + 9a20f0b
commit 0311205
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/...s/Scaffolding Rush/data/scaffolding_rush/functions/player/death/respawn/revive.mcfunction b/...s/Scaffolding Rush/data/scaffolding_rush/functions/player/death/respawn/revive.mcfunction
@@ -1,4 +1,8 @@
 
+# Remove the "Red Screen"
+item replace entity @s armor.head with air
+
+
 execute positioned as @e[type=villager,tag=respawn_villager,tag=red_villager,limit=1,sort=nearest] run tp @s[team=red,tag=player.can_respawn,tag=!inTutorial] ~ ~ ~
 execute positioned as @e[type=villager,tag=respawn_villager,tag=blue_villager,limit=1,sort=nearest] run tp @s[team=blue,tag=player.can_respawn,tag=!inTutorial] ~ ~ ~
 execute positioned as @e[type=villager,tag=respawn_villager,tag=green_villager,limit=1,sort=nearest] run tp @s[team=green,tag=player.can_respawn,tag=!inTutorial] ~ ~ ~

diff --git a/...ks/Scaffolding Rush/data/scaffolding_rush/functions/player/death/respawn/start.mcfunction b/...ks/Scaffolding Rush/data/scaffolding_rush/functions/player/death/respawn/start.mcfunction
@@ -5,7 +5,6 @@ scoreboard players operation @s respawn.timer = #respawn.delay.tick options
 scoreboard players operation @s respawn.timer > 1 const
 
 gamemode spectator @s
-item replace entity @s armor.head with air
 tag @s remove player.death.drown_in_lava
 tag @s remove player.death.killed_by_player
 tag @s add player.item.can_have_items