Skip to content

Commit

Permalink
Add fall tunnel setting and move onServer and onInstance setup from s…
Browse files Browse the repository at this point in the history
…etup file (0.13.19)
  • Loading branch information
Bavadin authored Dec 20, 2024
1 parent 651592c commit f0e229b
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,30 @@ execute if score $dungeon do2.utility.onInstance matches 1 run setworldspawn -54
execute if score $dungeon do2.utility.onInstance matches 1 run setblock -551 119 1977 minecraft:redstone_block
execute if score $dungeon do2.utility.onInstance matches 0 run setblock -551 119 1977 air

# If server does not have is-dungeon-instance, remove the fall chamber.
# If server has is-dungeon-instance, create fall chamber.
execute if score $dungeon do2.utility.onInstance matches 1 run setblock -548 70 1979 minecraft:glass
execute if score $dungeon do2.utility.onInstance matches 1 run setblock -548 70 1981 minecraft:glass
execute if score $dungeon do2.utility.onInstance matches 1 run setblock -548 71 1978 minecraft:glass
execute if score $dungeon do2.utility.onInstance matches 1 run setblock -548 71 1982 minecraft:glass
execute if score $dungeon do2.utility.onInstance matches 1 run setblock -549 71 1979 minecraft:glass
execute if score $dungeon do2.utility.onInstance matches 1 run setblock -549 71 1981 minecraft:glass
execute if score $dungeon do2.utility.onInstance matches 1 run setblock -548 72 1979 minecraft:glass
execute if score $dungeon do2.utility.onInstance matches 1 run setblock -548 72 1981 minecraft:glass
execute if score $dungeon do2.utility.onInstance matches 1 run setblock -548 71 1981 minecraft:command_block[conditional=false,facing=west]{Command:"log-event spawnpoint-recovery-button 1"}
execute if score $dungeon do2.utility.onInstance matches 1 run setblock -548 71 1979 minecraft:command_block[conditional=false,facing=west]{Command:"/tp @p -547 114 1980"}
execute if score $dungeon do2.utility.onInstance matches 1 run fill -546 72 1980 -546 70 1980 minecraft:bamboo_mosaic
execute if score $dungeon do2.utility.onInstance matches 1 run fill -547 72 1979 -547 70 1979 minecraft:bamboo_mosaic
execute if score $dungeon do2.utility.onInstance matches 1 run fill -548 72 1980 -548 70 1980 minecraft:bamboo_mosaic
execute if score $dungeon do2.utility.onInstance matches 1 run fill -547 72 1981 -547 70 1981 minecraft:bamboo_mosaic
execute if score $dungeon do2.utility.onInstance matches 1 run setblock -547 70 1980 minecraft:bamboo_mosaic_slab[type=bottom,waterlogged=true]
execute if score $dungeon do2.utility.onInstance matches 1 run setblock -547 71 1980 minecraft:stone_button[face=wall,facing=east]
execute if score $dungeon do2.utility.onInstance matches 1 run setblock -547 72 1980 minecraft:bamboo_wall_sign[facing=east]{front_text:{color:"black",has_glowing_text:0b,messages:['{"text":"If you need to"}','{"text":"use this button"}','{"text":"please tell one"}','{"text":"of the staff"}']},is_waxed:0b}
execute if score $dungeon do2.utility.onInstance matches 1 run fill -546 109 1980 -546 73 1980 minecraft:glass
execute if score $dungeon do2.utility.onInstance matches 1 run fill -547 109 1979 -547 73 1979 minecraft:glass
execute if score $dungeon do2.utility.onInstance matches 1 run fill -548 109 1980 -548 73 1980 minecraft:glass
execute if score $dungeon do2.utility.onInstance matches 1 run fill -547 109 1981 -547 73 1981 minecraft:glass
execute if score $dungeon do2.utility.onInstance matches 1 run fill -547 111 1981 -547 110 1979 minecraft:bamboo_mosaic
execute if score $dungeon do2.utility.onInstance matches 1 run fill -548 111 1980 -548 110 1980 minecraft:bamboo_mosaic
execute if score $dungeon do2.utility.onInstance matches 0 run fill -548 111 1980 -548 73 1980 air
execute if score $dungeon do2.utility.onInstance matches 0 run fill -547 111 1981 -547 73 1981 air
execute if score $dungeon do2.utility.onInstance matches 0 run fill -546 109 1980 -546 73 1980 air
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,6 @@ execute unless score $dungeon do2.utility.statsScreen matches 0.. run scoreboard
scoreboard objectives add do2.utility.priceChecker dummy "Used to count the price of cards in shops"
scoreboard objectives add do2.utility.receivedJackpot dummy "Used to count the keys in loot boxes to see if Jackpot was won"
scoreboard objectives add do2.utility.playersExperience dummy "Used to count how much experience players have."
scoreboard objectives add do2.utility.onServer dummy "Checking if this Brilliance is loaded on the server"
execute unless score $dungeon do2.utility.onServer matches 0.. run scoreboard players set $dungeon do2.utility.onServer 0
scoreboard objectives add do2.utility.onInstance dummy "Checking if this Brilliance is loaded on an instance"
execute unless score $dungeon do2.utility.onInstance matches 0.. run scoreboard players set $dungeon do2.utility.onInstance 0


# - Mob Controller - (mob_controller)
Expand Down
4 changes: 2 additions & 2 deletions Brilliance Datapack/data/do2/functions/version.mcfunction
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# DATAPACK VERSION NUMBER: 0.13.18
# DATAPACK VERSION NUMBER: 0.13.19

tellraw @s ["",{"text":"The §o§n§aBrilliance Datapack§r's version is: [§b0.13.18§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.19§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":"."}]

0 comments on commit f0e229b

Please sign in to comment.