From a7a65d9454fb492436146f1f27832cc6c413cf87 Mon Sep 17 00:00:00 2001 From: Vincent Foriel Date: Tue, 10 Oct 2023 10:37:52 +0200 Subject: [PATCH] Smoother lobby protection --- .../functions/lobby/__main__.mcfunction | 3 --- .../lobby/protection/__main__.mcfunction | 8 ++++---- .../projectile_in_protected_area.mcfunction | 5 +++++ level.dat | Bin 3903 -> 4097 bytes 4 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 datapacks/Scaffolding Rush/data/scaffolding_rush/functions/lobby/protection/projectile_in_protected_area.mcfunction 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 f987eb4c3fffa9ab23645a6c33059dbac1043359..13faf136254db3a401e508a8e4bf7d00d9ec4107 100644 GIT binary patch literal 4097 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 literal 3903 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