Skip to content

Commit eb95a15

Browse files
L_glandieresL_glandieres
L_glandieres
authored and
L_glandieres
committed
fix map reset
1 parent caa7792 commit eb95a15

File tree

7 files changed

+28
-25
lines changed

7 files changed

+28
-25
lines changed

‎datapacks/Scaffolding Rush/data/scaffolding_rush/function/__load__.mcfunction‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,3 +269,4 @@ advancement revoke @a only scaffolding_rush:grab_villager/yellow
269269

270270
# Reset the lobby
271271
function scaffolding_rush:lobby/map/reset/__start__
272+
function scaffolding_rush:game/map/reset/__start__

‎datapacks/Scaffolding Rush/data/scaffolding_rush/function/game/map/reset/__start__.mcfunction‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@ bossbar set reset_map players @a
1414
bossbar set reset_map max 256
1515
bossbar set reset_map color red
1616

17-
kill @e[type=marker,name="ScR_ClearGame"]
18-
execute unless entity @e[type=marker,name="ScR_ClearGame"] run summon minecraft:marker 1000 319 1000 {CustomName: '{"text":"ScR_ClearGame"}'}
19-
teleport @e[type=marker,name="ScR_ClearGame",limit=1] 1000 319 1000
20-
execute as @e[type=marker,name="ScR_ClearGame",limit=1] store result score @s pos.y run data get entity @s Pos[1]
17+
forceload add 1000 1000
18+
kill @e[type=marker,tag=ScR_ClearGame]
19+
execute unless entity @n[type=marker,tag=ScR_ClearGame] run summon minecraft:marker 1000 319 1000 {Tags:["ScR_ClearGame"]}
20+
teleport @n[type=marker,tag=ScR_ClearGame,limit=1] 1000 319 1000
21+
execute as @n[type=marker,tag=ScR_ClearGame,limit=1] store result score @s pos.y run data get entity @s Pos[1]
2122

2223
function scaffolding_rush:game/map/reset/wait_chunk

‎datapacks/Scaffolding Rush/data/scaffolding_rush/function/game/map/reset/area.mcfunction‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11

22
#Recursively removes all blocks in the playing area
33

4-
execute as @e[type=marker,name="ScR_ClearGame",limit=1] at @s if score @s pos.y matches 2.. run fill ~-90 ~ ~-90 ~90 ~ ~90 air replace #scaffolding_rush:clear_game
5-
execute as @e[type=marker,name="ScR_ClearGame",limit=1] at @s if score @s pos.y matches 3.. run fill ~-90 ~-1 ~-90 ~90 ~-1 ~90 air replace #scaffolding_rush:clear_game
4+
execute as @e[type=marker,tag=ScR_ClearGame,limit=1] at @s if score @s pos.y matches 2.. run fill ~-90 ~ ~-90 ~90 ~ ~90 air replace #scaffolding_rush:clear_game
5+
execute as @e[type=marker,tag=ScR_ClearGame,limit=1] at @s if score @s pos.y matches 3.. run fill ~-90 ~-1 ~-90 ~90 ~-1 ~90 air replace #scaffolding_rush:clear_game
66

7-
execute as @e[type=marker,name="ScR_ClearGame",limit=1] at @s run teleport @s ~ ~-2 ~
8-
execute as @e[type=marker,name="ScR_ClearGame",limit=1] store result score @s pos.y run data get entity @s Pos[1]
7+
execute as @e[type=marker,tag=ScR_ClearGame,limit=1] at @s run teleport @s ~ ~-2 ~
8+
execute as @e[type=marker,tag=ScR_ClearGame,limit=1] store result score @s pos.y run data get entity @s Pos[1]
99

10-
scoreboard players operation RESET_MAP data = @e[type=marker,name="ScR_ClearGame",limit=1] pos.y
10+
scoreboard players operation RESET_MAP data = @e[type=marker,tag=ScR_ClearGame,limit=1] pos.y
1111
scoreboard players operation RESET_MAP data *= -1 const
1212
scoreboard players operation RESET_MAP data += 256 const
1313
execute store result bossbar reset_map value run scoreboard players get RESET_MAP data
1414

1515
#execute unless score @s pos.y matches 2 at @s run function scaffolding_rush:game/map/reset/area
16-
execute unless score @e[type=marker,name="ScR_ClearGame",limit=1] pos.y matches ..1 run schedule function scaffolding_rush:game/map/reset/area 1t
17-
execute as @e[type=marker,name="ScR_ClearGame",limit=1] if score @s pos.y matches ..1 at @s run schedule function scaffolding_rush:game/map/reset/finish 5t
16+
execute unless score @e[type=marker,tag=ScR_ClearGame,limit=1] pos.y matches ..1 run schedule function scaffolding_rush:game/map/reset/area 1t
17+
execute as @e[type=marker,tag=ScR_ClearGame,limit=1] if score @s pos.y matches ..1 at @s run schedule function scaffolding_rush:game/map/reset/finish 5t

‎datapacks/Scaffolding Rush/data/scaffolding_rush/function/game/map/reset/wait_chunk.mcfunction‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11

2-
execute unless entity @e[type=marker,name="ScR_ClearGame",limit=1] run schedule function scaffolding_rush:game/map/reset/wait_chunk 5t
3-
execute as @e[type=marker,name="ScR_ClearGame",limit=1] at @s run schedule function scaffolding_rush:game/map/reset/area 2t
2+
execute unless entity @e[type=marker,tag=ScR_ClearGame,limit=1] run schedule function scaffolding_rush:game/map/reset/wait_chunk 5t
3+
execute as @e[type=marker,tag=ScR_ClearGame,limit=1] at @s run schedule function scaffolding_rush:game/map/reset/area 2t

‎datapacks/Scaffolding Rush/data/scaffolding_rush/function/lobby/map/reset/__start__.mcfunction‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ bossbar set reset_lobby players @a
1010
bossbar set reset_lobby max 256
1111
bossbar set reset_lobby color purple
1212

13-
kill @e[type=marker,name="ScR_ClearLobby"]
14-
execute unless entity @e[type=marker,name="ScR_ClearLobby"] run summon minecraft:marker 0 319 0 {CustomName: '{"text":"ScR_ClearLobby"}'}
15-
teleport @e[type=marker,name="ScR_ClearLobby",limit=1] 0 319 0
13+
kill @e[type=marker,tag=ScR_ClearLobby]
14+
execute unless entity @e[type=marker,tag=ScR_ClearLobby] run summon minecraft:marker 0 319 0 {CustomName: '{"text":"ScR_ClearLobby"}', Tags:["ScR_ClearLobby"]}
15+
teleport @e[type=marker,tag=ScR_ClearLobby,limit=1] 0 319 0
16+
forceload add 0 0 0 0
1617

1718
function scaffolding_rush:lobby/map/reset/wait_chunk

‎datapacks/Scaffolding Rush/data/scaffolding_rush/function/lobby/map/reset/area.mcfunction‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11

22

33

4-
execute at @e[type=marker,name="ScR_ClearLobby",limit=1] run fill ~-90 ~ ~-90 ~90 ~ ~90 air replace #scaffolding_rush:clear_lobby
5-
execute at @e[type=marker,name="ScR_ClearLobby",limit=1] run fill ~-90 ~-1 ~-90 ~90 ~-1 ~90 air replace #scaffolding_rush:clear_lobby
4+
execute at @e[type=marker,tag=ScR_ClearLobby,limit=1] run fill ~-90 ~ ~-90 ~90 ~ ~90 air replace #scaffolding_rush:clear_lobby
5+
execute at @e[type=marker,tag=ScR_ClearLobby,limit=1] run fill ~-90 ~-1 ~-90 ~90 ~-1 ~90 air replace #scaffolding_rush:clear_lobby
66

7-
execute as @e[type=marker,name="ScR_ClearLobby",limit=1] at @s run teleport @s ~ ~-2 ~
8-
execute as @e[type=marker,name="ScR_ClearLobby",limit=1] store result score @s pos.y run data get entity @s Pos[1]
7+
execute as @e[type=marker,tag=ScR_ClearLobby,limit=1] at @s run teleport @s ~ ~-2 ~
8+
execute as @e[type=marker,tag=ScR_ClearLobby,limit=1] store result score @s pos.y run data get entity @s Pos[1]
99

10-
scoreboard players operation RESET_LOBBY data = @e[type=marker,name="ScR_ClearLobby",limit=1] pos.y
10+
scoreboard players operation RESET_LOBBY data = @e[type=marker,tag=ScR_ClearLobby,limit=1] pos.y
1111
scoreboard players operation RESET_LOBBY data *= -1 const
1212
scoreboard players operation RESET_LOBBY data += 256 const
1313
execute store result bossbar reset_lobby value run scoreboard players get RESET_LOBBY data
1414

1515
#execute unless score @s pos.y matches 2 at @s run function scaffolding_rush:lobby/map/reset/area
16-
execute unless score @e[type=marker,name="ScR_ClearLobby",limit=1] pos.y matches ..1 run schedule function scaffolding_rush:lobby/map/reset/area 1t
17-
execute as @e[type=marker,name="ScR_ClearLobby",limit=1] if score @s pos.y matches ..1 at @s run function scaffolding_rush:lobby/map/reset/finish
16+
execute unless score @e[type=marker,tag=ScR_ClearLobby,limit=1] pos.y matches ..1 run schedule function scaffolding_rush:lobby/map/reset/area 1t
17+
execute as @e[type=marker,tag=ScR_ClearLobby,limit=1] if score @s pos.y matches ..1 at @s run function scaffolding_rush:lobby/map/reset/finish

‎datapacks/Scaffolding Rush/data/scaffolding_rush/function/lobby/map/reset/wait_chunk.mcfunction‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11

2-
execute unless entity @e[type=marker,name="ScR_ClearLobby",limit=1] run schedule function scaffolding_rush:lobby/map/reset/wait_chunk 5t
3-
execute as @e[type=marker,name="ScR_ClearLobby",limit=1] at @s run schedule function scaffolding_rush:lobby/map/reset/area 2t
2+
execute unless entity @e[type=marker,tag=ScR_ClearLobby,limit=1] run schedule function scaffolding_rush:lobby/map/reset/wait_chunk 5t
3+
execute as @e[type=marker,tag=ScR_ClearLobby,limit=1] at @s run schedule function scaffolding_rush:lobby/map/reset/area 2t

0 commit comments

Comments
 (0)