diff --git a/Brilliance Datapack/data/do2/functions/dungeon_setup/all.mcfunction b/Brilliance Datapack/data/do2/functions/dungeon_setup/all.mcfunction index 920a08b6..5e11881f 100644 --- a/Brilliance Datapack/data/do2/functions/dungeon_setup/all.mcfunction +++ b/Brilliance Datapack/data/do2/functions/dungeon_setup/all.mcfunction @@ -27,8 +27,8 @@ function do2:dungeon_setup/test_for_markers function do2:dungeon_setup/reset_hopper_minecarts/test_for_accurate_blocks function do2:dungeon_setup/reset_hopper_minecarts/test_for_tags function do2:dungeon_setup/reset_hopper_minecarts/set_inventories -schedule function do2:dungeon_setup/summon/others 3t -schedule function do2:dungeon_setup/teleport_killers/all 3t +schedule function do2:dungeon_setup/summon/others 3t append +schedule function do2:dungeon_setup/teleport_killers/all 3t append function do2:egg_hunt/spawn_egg_hitboxes function do2:scoreboard/config/balance_changes/actions diff --git a/Brilliance Datapack/data/do2/functions/dungeon_setup/summon/markers.mcfunction b/Brilliance Datapack/data/do2/functions/dungeon_setup/summon/markers.mcfunction index d8841dca..0d2a4a83 100644 --- a/Brilliance Datapack/data/do2/functions/dungeon_setup/summon/markers.mcfunction +++ b/Brilliance Datapack/data/do2/functions/dungeon_setup/summon/markers.mcfunction @@ -2,4 +2,4 @@ kill @e[type=marker,tag=no-zones] kill @e[type=marker,tag=with-zones] -schedule function do2:dungeon_setup/summon/summon_markers 1t +schedule function do2:dungeon_setup/summon/summon_markers 1t append diff --git a/Brilliance Datapack/data/do2/functions/dungeon_setup/summon/other_killers.mcfunction b/Brilliance Datapack/data/do2/functions/dungeon_setup/summon/other_killers.mcfunction index 5efee447..4e9c85df 100644 --- a/Brilliance Datapack/data/do2/functions/dungeon_setup/summon/other_killers.mcfunction +++ b/Brilliance Datapack/data/do2/functions/dungeon_setup/summon/other_killers.mcfunction @@ -8,4 +8,4 @@ kill @e[type=minecraft:stray] execute as @e[type=minecraft:evoker] at @s run kill @e[type=minecart,distance=..2] kill @e[type=minecraft:evoker] -schedule function do2:dungeon_setup/summon/summon_other_killers 1t +schedule function do2:dungeon_setup/summon/summon_other_killers 1t append diff --git a/Brilliance Datapack/data/do2/functions/dungeon_setup/summon/others.mcfunction b/Brilliance Datapack/data/do2/functions/dungeon_setup/summon/others.mcfunction index 954dcf29..75fff666 100644 --- a/Brilliance Datapack/data/do2/functions/dungeon_setup/summon/others.mcfunction +++ b/Brilliance Datapack/data/do2/functions/dungeon_setup/summon/others.mcfunction @@ -8,4 +8,4 @@ kill @e[type=minecraft:interaction,tag=parrot_blocker] kill @e[type=minecraft:interaction,tag=dropper_blocker] kill @e[type=minecraft:interaction,tag=trapdoor_blocker] -schedule function do2:dungeon_setup/summon/summon_others 3t +schedule function do2:dungeon_setup/summon/summon_others 3t append diff --git a/Brilliance Datapack/data/do2/functions/dungeon_setup/summon/ravagers.mcfunction b/Brilliance Datapack/data/do2/functions/dungeon_setup/summon/ravagers.mcfunction index 7ae3d9cb..55894ced 100644 --- a/Brilliance Datapack/data/do2/functions/dungeon_setup/summon/ravagers.mcfunction +++ b/Brilliance Datapack/data/do2/functions/dungeon_setup/summon/ravagers.mcfunction @@ -1,3 +1,3 @@ # - Make sure we don't have duplicates - kill @e[type=ravager] -schedule function do2:dungeon_setup/summon/summon_ravagers 3t +schedule function do2:dungeon_setup/summon/summon_ravagers 3t append diff --git a/Brilliance Datapack/data/do2/functions/dungeon_setup/summon/wardens.mcfunction b/Brilliance Datapack/data/do2/functions/dungeon_setup/summon/wardens.mcfunction index bce85405..64ad4d36 100644 --- a/Brilliance Datapack/data/do2/functions/dungeon_setup/summon/wardens.mcfunction +++ b/Brilliance Datapack/data/do2/functions/dungeon_setup/summon/wardens.mcfunction @@ -1,4 +1,4 @@ # - Make sure we don't have duplicates - kill @e[type=warden] -schedule function do2:dungeon_setup/summon/summon_wardens 1t +schedule function do2:dungeon_setup/summon/summon_wardens 1t append diff --git a/Brilliance Datapack/data/do2/functions/events/on_datapack_load.mcfunction b/Brilliance Datapack/data/do2/functions/events/on_datapack_load.mcfunction index 66ef0464..458045fe 100644 --- a/Brilliance Datapack/data/do2/functions/events/on_datapack_load.mcfunction +++ b/Brilliance Datapack/data/do2/functions/events/on_datapack_load.mcfunction @@ -18,7 +18,7 @@ execute unless score $dungeon do2.tests.doesTangoCamExist matches 1 run function scoreboard objectives remove do2.tests.doesTangoCamExist # Attempt to run dungeon_setup -scoreboard players set $dungeon do2.utility.dungeonRepair 1 +schedule function do2:postpone_dungeon_setup 1s append # One time setup: gamerule spawnRadius 0 diff --git a/Brilliance Datapack/data/do2/functions/events/on_player_join.mcfunction b/Brilliance Datapack/data/do2/functions/events/on_player_join.mcfunction index 800d63da..edaf03e9 100644 --- a/Brilliance Datapack/data/do2/functions/events/on_player_join.mcfunction +++ b/Brilliance Datapack/data/do2/functions/events/on_player_join.mcfunction @@ -32,4 +32,4 @@ execute positioned -524 103 2167 if entity @s[distance=..10] at @s run tp @s ~ ~ execute if score $dungeon do2.utility.onServer matches 1 unless score $dungeon do2.run.active matches 1.. as @p[tag=do2.received_shulker] run function do2:dungeon_setup/preset_difficulty # Give playsound tag according to player Voice Chat status -schedule function do2:voice_chat/set 5t \ No newline at end of file +schedule function do2:voice_chat/set 5t append diff --git a/Brilliance Datapack/data/do2/functions/gui/update_has_map_tag/invoke_update.mcfunction b/Brilliance Datapack/data/do2/functions/gui/update_has_map_tag/invoke_update.mcfunction index 3a0a859f..559a2024 100644 --- a/Brilliance Datapack/data/do2/functions/gui/update_has_map_tag/invoke_update.mcfunction +++ b/Brilliance Datapack/data/do2/functions/gui/update_has_map_tag/invoke_update.mcfunction @@ -1,3 +1,3 @@ execute as @a[tag=do2.tags.gui.enable] run function do2:gui/update_has_map_tag/update -schedule function do2:gui/update_has_map_tag/invoke_update 4s replace +schedule function do2:gui/update_has_map_tag/invoke_update 4s append diff --git a/Brilliance Datapack/data/do2/functions/postpone_dungeon_setup.mcfunction b/Brilliance Datapack/data/do2/functions/postpone_dungeon_setup.mcfunction new file mode 100644 index 00000000..2a646273 --- /dev/null +++ b/Brilliance Datapack/data/do2/functions/postpone_dungeon_setup.mcfunction @@ -0,0 +1,2 @@ +# Attempt to run dungeon_setup +scoreboard players set $dungeon do2.utility.dungeonRepair 1 diff --git a/Brilliance Datapack/data/do2/functions/version.mcfunction b/Brilliance Datapack/data/do2/functions/version.mcfunction index 3183a6e7..929887c2 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.12.30 +# DATAPACK VERSION NUMBER: 0.12.31 -tellraw @s ["",{"text":"The §o§n§aBrilliance Datapack§r's version is: [§b0.12.30§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.12.31§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":"."}]