diff --git a/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/lobby/__main__.mcfunction b/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/lobby/__main__.mcfunction index 2f286689..1dd6e322 100644 --- a/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/lobby/__main__.mcfunction +++ b/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/lobby/__main__.mcfunction @@ -35,9 +35,6 @@ function scaffolding_rush:lobby/interaction/__main__ execute as @a[gamemode=survival] at @s if block ~ ~-0.01 ~ magma_block run kill @s -execute at @e[tag=LobbyProtection] run particle cloud ~ ~ ~ 0 0 0 0.1 3 force -execute as @e[tag=LobbyProtection] run kill @s - execute as @a[scores={trigger.tutorial=1}] run function scaffolding_rush:tutorial/join tag @a[tag=!player.item.can_have_book] add player.item.can_have_book diff --git a/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/lobby/protection/__main__.mcfunction b/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/lobby/protection/__main__.mcfunction index fb0ebba9..09d23824 100644 --- a/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/lobby/protection/__main__.mcfunction +++ b/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/lobby/protection/__main__.mcfunction @@ -4,8 +4,8 @@ tag @a[tag=lobby.just_exit_protected_area] remove lobby.just_exit_protected_area execute as @a[tag=lobby.in_protected_area] positioned -6 24 -5 unless entity @s[dx=14,dy=14,dz=14] run tag @s add lobby.just_exit_protected_area tag @a[tag=lobby.in_protected_area] remove lobby.in_protected_area -execute positioned -6 24 -5 as @a[dx=14,dy=14,dz=14] run function scaffolding_rush:lobby/protection/player_in_protected_area -execute positioned -6 24 -5 as @e[type=arrow,dx=14,dy=14,dz=14] at @s run tag @s add LobbyProtection -execute positioned -6 24 -5 as @e[tag=Fireball,dx=14,dy=14,dz=14] at @s run tag @s add LobbyProtection +tag @a add player.item.can_have_items -execute positioned -6 24 -5 as @a unless entity @s[dx=14,dy=14,dz=14] run tag @s add player.item.can_have_items \ No newline at end of file +execute positioned -6 24 -5 as @a[dx=14,dy=14,dz=14] run function scaffolding_rush:lobby/protection/player_in_protected_area +execute positioned -6 24 -5 as @e[type=arrow,dx=14,dy=14,dz=14] at @s run function scaffolding_rush:lobby/protection/projectile_in_protected_area +execute positioned -6 24 -5 as @e[tag=Fireball,dx=14,dy=14,dz=14] at @s run function scaffolding_rush:lobby/protection/projectile_in_protected_area diff --git a/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/lobby/protection/projectile_in_protected_area.mcfunction b/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/lobby/protection/projectile_in_protected_area.mcfunction new file mode 100644 index 00000000..5f919602 --- /dev/null +++ b/datapacks/Scaffolding Rush/data/scaffolding_rush/functions/lobby/protection/projectile_in_protected_area.mcfunction @@ -0,0 +1,5 @@ + +playsound minecraft:block.anvil.land master @a[distance=..30] ~ ~ ~ 0.3 2 0 +particle minecraft:explosion ~ ~ ~ 0 0 0 0 1 force +particle cloud ~ ~ ~ 0 0 0 0.1 5 force +kill @s \ No newline at end of file diff --git a/level.dat b/level.dat index f987eb4c..13faf136 100644 Binary files a/level.dat and b/level.dat differ