Skip to content

Commit 9bc2a65

Browse files
authored
Add TangoCam 'afterPlayerJoin' tag and use it in the kill check (0.14.26)
1 parent 6ed1060 commit 9bc2a65

File tree

5 files changed

+12
-9
lines changed

5 files changed

+12
-9
lines changed

Brilliance Datapack/data/do2/functions/events/on_100_ticks.mcfunction

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ execute if score $dungeon do2.run.active matches 0 run function do2:entity_contr
1717
# Count players on the server.
1818
scoreboard players set $dungeon do2.utility.playerCount 0
1919
execute as @a[tag=!do2.fakePlayer] run scoreboard players add $dungeon do2.utility.playerCount 1
20+
execute if score $dungeon do2.utility.playerCount matches 1.. run tag TangoCam add do2.afterPlayerJoin
21+
execute if score $dungeon do2.utility.playerCount matches 1.. run tag tangocam add do2.afterPlayerJoin
2022

2123
# Enable/Disable certain triggers
2224
execute as @a run function do2:scoreboard/triggers/on_player_join

Brilliance Datapack/data/do2/functions/events/on_20_ticks.mcfunction

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ execute as @a[scores={do2.logs.spam=2..}] run tellraw @s ["",{"text":"§f[§9B§
55
# - End Log -
66

77
# Kill TangoCam if no player's are on the server.
8-
execute unless entity @a[tag=!do2.fakePlayer] if entity @a[name=TangoCam] run kill TangoCam
9-
execute unless entity @a[tag=!do2.fakePlayer] if entity @a[name=tangocam] run kill tangocam
8+
execute unless entity @a[tag=!do2.fakePlayer] if entity @a[name=TangoCam,tag=do2.afterPlayerJoin] run kill TangoCam
9+
execute unless entity @a[tag=!do2.fakePlayer] if entity @a[name=tangocam,tag=do2.afterPlayerJoin] run kill tangocam
1010

1111
# Only do dungeon repair IF: an actual player is loading the dungeon.
1212
execute if score $dungeon do2.utility.dungeonRepair matches 1 positioned -548 41.00 1984 if entity @a[tag=!do2.fakePlayer,distance=..300] run function do2:dungeon_setup/all

Brilliance Datapack/data/do2/functions/external/carpet_mod/summon_tangocam.mcfunction

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@ execute if entity @p[name=TangoCam] run clear TangoCam
1212
execute if entity @p[name=TangoCam] run give TangoCam minecraft:filled_map{map: 976,CustomModelData:201}
1313
execute if entity @p[name=TangoCam] run tag TangoCam add do2.spectating
1414
execute if entity @p[name=TangoCam] run tag TangoCam add do2.fakePlayer
15-
15+
execute if entity @p[name=TangoCam] run tag TangoCam remove do2.afterPlayerJoin
1616

1717
# For lowercase tangocam
1818
execute if entity @p[name=tangocam] run clear tangocam
1919
execute if entity @p[name=tangocam] run give tangocam minecraft:filled_map{map: 976,CustomModelData:201}
2020
execute if entity @p[name=tangocam] run tag tangocam add do2.spectating
2121
execute if entity @p[name=tangocam] run tag tangocam add do2.fakePlayer
22+
execute if entity @p[name=tangocam] run tag tangocam add do2.afterPlayerJoin

Brilliance Datapack/data/do2/functions/scoreboard/setup/all.mcfunction

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,13 @@ function do2:scoreboard/setup/logs
6262
# - Dungeon Config -
6363
function do2:scoreboard/setup/config
6464

65-
# - systems -
65+
# - Systems -
6666
function do2:scoreboard/setup/systems
6767

68-
# - easter eggs -
68+
# - Easter Eggs -
6969
function do2:scoreboard/setup/easter_eggs
7070

71-
# - cards -
71+
# - Cards -
7272
function do2:scoreboard/setup/cards/cards_available_run
7373
function do2:scoreboard/setup/cards/cards_available_total
7474
function do2:scoreboard/setup/cards/cards_bought_run
@@ -78,7 +78,7 @@ function do2:scoreboard/setup/cards/cards_played_total
7878
function do2:scoreboard/setup/cards/inside_deck
7979
function do2:scoreboard/setup/cards/cards_price
8080

81-
# - items -
81+
# - Items -
8282
function do2:scoreboard/setup/items
8383

8484
# - Artifacts and Artifakes -
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
# DATAPACK VERSION NUMBER: 0.14.25
1+
# DATAPACK VERSION NUMBER: 0.14.26
22

3-
tellraw @s ["",{"text":"The §o§n§aBrilliance Datapack§r's version is: [§b0.14.25§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":"."}]
3+
tellraw @s ["",{"text":"The §o§n§aBrilliance Datapack§r's version is: [§b0.14.26§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 commit comments

Comments
 (0)