diff --git a/Brilliance Datapack/data/do2/functions/scoreboard/config/config_lock.mcfunction b/Brilliance Datapack/data/do2/functions/scoreboard/config/config_lock.mcfunction index 52b9cbc0..1d88e13d 100644 --- a/Brilliance Datapack/data/do2/functions/scoreboard/config/config_lock.mcfunction +++ b/Brilliance Datapack/data/do2/functions/scoreboard/config/config_lock.mcfunction @@ -4,5 +4,6 @@ summon minecraft:armor_stand -514 114.7 1956 {CustomName:'{"text":"Settings cann summon minecraft:item_display -514.4 116 1956 {Tags:["do2.stop_settings"],width:1f,height:1f,item:{id:"minecraft:barrier",Count:1b},view_range:2f,transformation:{left_rotation:[0f,-1f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0f,0f],scale:[0.8f,0.8f,2f]}} fill -515 118 1954 -515 114 1958 minecraft:iron_bars replace air +execute as @a[x=-539,dx=25,y=113,dy=7,z=1938,dz=23] if entity @s[tag=do2.staff,tag=!warned] run tellraw @s ["",{"text":"§f[§9B§r]: You have the tag [§bdo2.staff§r], and this has stopped:\n - §5tp "},{"selector":"@s","color":"dark_purple"},{"text":"§5-512 114 1956 90 0\n§f[§9B§r]: Click "},{"text":"§b[here]","clickEvent":{"action":"run_command","value":"/tp @s -512 114 1956 90 0"}},{"text":" to run the command anyway."}] +execute as @a[x=-539,dx=25,y=113,dy=7,z=1938,dz=23] if entity @s[tag=do2.staff,tag=!do2.staff.warned] run tag @s add do2.staff.warned execute as @a[x=-539,dx=25,y=113,dy=7,z=1938,dz=23] unless entity @s[tag=do2.staff] run tp @s -512 114 1956 90 0 -execute as @a[x=-539,dx=25,y=113,dy=7,z=1938,dz=23] if entity @s[tag=do2.staff] run tellraw @s ["",{"text":"§f[§9B§r]: You have the tag [§bdo2.staff§r], and this has stopped:\n - §5tp "},{"selector":"@s","color":"dark_purple"},{"text":"§5-512 114 1956 90 0\n§f[§9B§r]: Click "},{"text":"§b[here]","clickEvent":{"action":"run_command","value":"/tp @s -512 114 1956 90 0"}},{"text":" to run the command anyway."}] \ No newline at end of file diff --git a/Brilliance Datapack/data/do2/functions/scoreboard/config/config_unlock.mcfunction b/Brilliance Datapack/data/do2/functions/scoreboard/config/config_unlock.mcfunction index d32cb4bc..94111e18 100644 --- a/Brilliance Datapack/data/do2/functions/scoreboard/config/config_unlock.mcfunction +++ b/Brilliance Datapack/data/do2/functions/scoreboard/config/config_unlock.mcfunction @@ -1,2 +1,3 @@ kill @e[tag=do2.stop_settings] +execute as @a[tag=do2.staff.warned] run tag @s remove do2.staff.warned fill -515 118 1954 -515 114 1958 minecraft:air replace iron_bars diff --git a/Brilliance Datapack/data/do2/functions/spectating_controller/spectator_logic.mcfunction b/Brilliance Datapack/data/do2/functions/spectating_controller/spectator_logic.mcfunction index c1d2c646..1ea05d60 100644 --- a/Brilliance Datapack/data/do2/functions/spectating_controller/spectator_logic.mcfunction +++ b/Brilliance Datapack/data/do2/functions/spectating_controller/spectator_logic.mcfunction @@ -5,8 +5,8 @@ execute if score $dungeon do2.run.active matches 2 as @a[team=do2.spectators] ru # Enforce spectators to stay in lobby. (INSTANCE ONLY) execute unless score $dungeon do2.utility.onInstance matches 1 run return 0 -execute as @a[team=do2.spectators] if score $dungeon do2.run.active matches 3 at @s if entity @p[team=do2.players,distance=..1] run tellraw @s {"text":"Game is over, you are unable to spectate purchases.","color":"light_purple"} -execute as @a[team=do2.spectators] if score $dungeon do2.run.active matches 3 at @s if entity @p[team=do2.players,distance=..1] run tp @s -524 114 1980 +execute as @a[team=do2.spectators] if score $dungeon do2.run.active matches 3 at @s if entity @p[team=do2.players,distance=..1] unless entity @s[tag=do2.staff] run tellraw @s {"text":"Game is over, you are unable to spectate purchases.","color":"light_purple"} +execute as @a[team=do2.spectators] if score $dungeon do2.run.active matches 3 at @s if entity @p[team=do2.players,distance=..1] unless entity @s[tag=do2.staff] run tp @s -524 114 1980 # Game isn't active YET. diff --git a/Brilliance Datapack/data/do2/functions/version.mcfunction b/Brilliance Datapack/data/do2/functions/version.mcfunction index de12d041..32529180 100644 --- a/Brilliance Datapack/data/do2/functions/version.mcfunction +++ b/Brilliance Datapack/data/do2/functions/version.mcfunction @@ -1,3 +1,3 @@ -# DATAPACK VERSION NUMBER: 0.13.21 +# DATAPACK VERSION NUMBER: 0.13.22 -tellraw @s ["",{"text":"The §o§n§aBrilliance Datapack§r's version is: [§b0.13.21§r] Check latest version "},{"text":"§o§b§nhere§r","clickEvent":{"action":"open_url","value":"https://github.com/trackedout/Brilliance/blob/main/Brilliance%20Datapack/data/do2/functions/version.mcfunction"}},{"text":"."}] +tellraw @s ["",{"text":"The §o§n§aBrilliance Datapack§r's version is: [§b0.13.22§r] Check latest version "},{"text":"§o§b§nhere§r","clickEvent":{"action":"open_url","value":"https://github.com/trackedout/Brilliance/blob/main/Brilliance%20Datapack/data/do2/functions/version.mcfunction"}},{"text":"."}]