v2.3 for 1.17–1.19

.gitignore

@@ -0,0 +1 @@
+.datapack/

data/skywars/functions/goldrush/init.mcfunction

@@ -9,6 +9,7 @@
 
 gamerule commandBlockOutput false
 gamerule doDaylightCycle false
+gamerule spawnRadius 1
 time set day
 setworldspawn 25 139 1
 spawnpoint @a 25 139 1
@@ -37,9 +38,11 @@ scoreboard objectives add kit dummy "KitID"
 scoreboard objectives add health health "HP"
 scoreboard objectives add deaths deathCount "Deaths"
 scoreboard objectives add tags dummy "Tags"
+scoreboard objectives setdisplay sidebar.team.yellow wins
 scoreboard objectives setdisplay sidebar.team.red kills
+scoreboard objectives setdisplay sidebar.team.gray kills
 scoreboard players set limit players_ready 2
-
+scoreboard players set min players 1
 
 ### LOBBY ###
 
@@ -52,15 +55,16 @@ fill 33 142 -7 19 142 7 white_stained_glass
 setblock 27 139 -6 oak_wall_sign[facing=south]{Text1:'{"text":"","clickEvent":{"action":"run_command","value":"function skywars:goldrush/startsign"}}',Text2:'{"text":"Start","color":"green"}'}
 setblock 25 139 -6 oak_wall_sign[facing=south]{Text1:'{"text":"","clickEvent":{"action":"run_command","value":"function skywars:goldrush/ready"}}',Text2:'{"text":"Ready","color":"yellow"}'}
 setblock 27 139 6 oak_wall_sign{Text2:'{"text":"Made by","color":"white"}',Text3:'{"text":"Nixinova","color":"aqua"}'}
-setblock 25 139 6 oak_wall_sign{Text2:'{"text":"SkyWars v2.2","color":"green"}',Text3:'{"text":"Minecraft 1.17","color":"aqua"}'}
+setblock 25 139 6 oak_wall_sign{Text2:'{"text":"SkyWars v2.3","color":"green"}',Text3:'{"text":"(MC 1.17-1.19)","color":"aqua"}'}
 
 # Credit
 setblock 26 139 6 player_wall_head{SkullOwner:{Name:"Nixinova"}}
 
 ### MAP LOADING ###
 
 # Structure block platform
-fill 22 205 9 28 205 -5 light_blue_terracotta
+fill 22 205 9 28 205 -5 prismarine_slab[type=top]
+fill 22 207 9 28 207 -5 prismarine_slab
 
 # Ticker
 setblock 25 206 6 repeating_command_block{Command:"function skywars:goldrush/running",auto:true}
@@ -107,3 +111,4 @@ setblock 24 206 -4 structure_block{mode:LOAD,name:"skywars:isle_s4",posX:-5,posY
 setblock 25 206 7 command_block{Command:"setblock ~-1 ~ ~ air"}
 setblock 24 206 6 command_block{Command:'tellraw @a[team=playing] ["",{"text":"Starting!","color":"yellow"}]'}
 setblock 24 206 8 command_block{Command:"execute as @a[team=playing] at @s run fill ~ ~ ~ ~ ~-3 ~ air"}
+setblock 23 206 7 command_block{Command:"effect give @a[team=playing] slow_falling 5"}

data/skywars/functions/goldrush/ready.mcfunction

@@ -40,7 +40,8 @@ scoreboard players add currentTag tags 1
 execute if score currentTag tags matches 13.. run scoreboard players remove currentTag tags 12
 
 # Final commands
+execute if score @s ready matches 1 run tellraw @a [{"selector":"@s","color":"green"},{"text":" is ready!","color":"yellow"}]
 execute unless score @s ready matches 1 run tellraw @a [{"selector":"@s","color":"green"},{"text":" is now ready!","color":"green"}]
 scoreboard players set @s ready 1
 team join ready @s
-scoreboard players add count players_ready 1
+scoreboard players add count players_ready 1

data/skywars/functions/goldrush/running.mcfunction

@@ -13,15 +13,15 @@ execute store result score alive players if entity @e[team=playing]
 execute if score alive players <= min players if score ingame players matches 1 run function skywars:goldrush/winner
 
 # Lobby hotbar
-item entity @a[team=lobby,x=25,y=138,z=1,distance=..10] hotbar.0 replace diamond_sword{display:{Name:'"\\u00A7eLobby Blade"',Lore:['"\\u00A7cFight in the lobby!"']},Enchantments:[{id:"knockback",lvl:2}],Unbreakable:true,HideFlags:127}
-item entity @a[team=lobby,x=25,y=138,z=1,distance=..10] hotbar.1 replace air
-item entity @a[team=lobby,x=25,y=138,z=1,distance=..10] hotbar.2 replace air
-item entity @a[team=lobby,x=25,y=138,z=1,distance=..10] hotbar.3 replace written_book{pages:['[{"text":"Select a kit:\\n","color":"red"},{"text":"\\n\\u2022 ","color":"dark_aqua"},{"text":"Miner","color":"dark_aqua","clickEvent":{"action":"run_command","value":"/scoreboard players set @s kit 1"}},{"text":"\\n","color":"reset"},{"text":"\\u2022 ","color":"dark_aqua"},{"text":"Witch","color":"dark_aqua","clickEvent":{"action":"run_command","value":"/scoreboard players set @s kit 2"}},{"text":"\\n","color":"reset"},{"text":"\\u2022 ","color":"dark_aqua"},{"text":"Nurse","color":"dark_aqua","clickEvent":{"action":"run_command","value":"/scoreboard players set @s kit 3"}},{"text":"\\n\\u2022 ","color":"dark_aqua"},{"text":"Marksman","color":"dark_aqua","clickEvent":{"action":"run_command","value":"/scoreboard players set @s kit 4"}},{"text":"\\n\\u2022 ","color":"dark_aqua"},{"text":"Armourer","color":"dark_aqua","clickEvent":{"action":"run_command","value":"/scoreboard players set @s kit 5"}},{"text":"\\n\\u2022 ","color":"dark_aqua"},{"text":"Summoner","color":"dark_aqua","clickEvent":{"action":"run_command","value":"/scoreboard players set @s kit 6"}},{"text":"\\n\\u2022 ","color":"dark_aqua"},{"text":"Farmer","color":"dark_aqua","clickEvent":{"action":"run_command","value":"/scoreboard players set @s kit 7"}},{"text":"\\n\\u2022 ","color":"dark_aqua"},{"text":"Fisherman","color":"dark_aqua","clickEvent":{"action":"run_command","value":"/scoreboard players set @s kit 8"}}]'],title:"Kit Selector",author:"Nixinova",display:{Name:'"\\u00A7eKit Selector"',Lore:['"\\u00A7aSelect a kit"']},HideFlags:127}
-item entity @a[team=lobby,x=25,y=138,z=1,distance=..10] hotbar.4 replace air
-item entity @a[team=lobby,x=25,y=138,z=1,distance=..10] hotbar.5 replace written_book{pages:['[{"text":"\\u00A7cChoose a cage:\\u00A7r\\n"},{"text":"\\n\\u2022 Default","color":"reset","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 0"}},{"text":"\\n\\u2022 None","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 1"}},{"text":"\\n\\u2022 Glass: "},{"text":"\\u25a0","color":"blue","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 2"}},{"text":"\\u25a0","color":"green","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 3"}},{"text":"\\u25a0","color":"dark_aqua","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 4"}},{"text":"\\u25a0","color":"red","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 5"}},{"text":"\\u25a0","color":"light_purple","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 6"}},{"text":"\\u25a0","color":"yellow","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 7"}},{"text":"\\u25a0","color":"dark_blue","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 8"}},{"text":"\\u25a0","color":"dark_green","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 9"}},{"text":"\\u25a0","color":"dark_gray","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 10"}},{"text":"\\u25a0","color":"black","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 11"}},{"text":"\\n\\u2022 Iron","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 12"}},{"text":"\\n\\u2022 Wood","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 13"}}]'],title:"Cage Selector",author:"Nixinova",display:{Name:'"\\u00A7eCage Selector"',Lore:['"\\u00A7aChoose a cage"']},HideFlags:127}
-item entity @a[team=lobby,x=25,y=138,z=1,distance=..10] hotbar.6 replace air
-item entity @a[team=lobby,x=25,y=138,z=1,distance=..10] hotbar.7 replace air
-item entity @a[team=lobby,x=25,y=138,z=1,distance=..10] hotbar.8 replace air
+item replace entity @a[team=lobby,x=25,y=138,z=1,distance=..10] hotbar.0 with diamond_sword{display:{Name:'"\\u00A7eLobby Blade"',Lore:['"\\u00A7cFight in the lobby!"']},Enchantments:[{id:"knockback",lvl:2}],Unbreakable:true,HideFlags:127}
+item replace entity @a[team=lobby,x=25,y=138,z=1,distance=..10] hotbar.1 with air
+item replace entity @a[team=lobby,x=25,y=138,z=1,distance=..10] hotbar.2 with air
+item replace entity @a[team=lobby,x=25,y=138,z=1,distance=..10] hotbar.3 with written_book{pages:['[{"text":"Select a kit:\\n","color":"red"},{"text":"\\n\\u2022 ","color":"dark_aqua"},{"text":"Miner","color":"dark_aqua","clickEvent":{"action":"run_command","value":"/scoreboard players set @s kit 1"}},{"text":"\\n","color":"reset"},{"text":"\\u2022 ","color":"dark_aqua"},{"text":"Witch","color":"dark_aqua","clickEvent":{"action":"run_command","value":"/scoreboard players set @s kit 2"}},{"text":"\\n","color":"reset"},{"text":"\\u2022 ","color":"dark_aqua"},{"text":"Nurse","color":"dark_aqua","clickEvent":{"action":"run_command","value":"/scoreboard players set @s kit 3"}},{"text":"\\n\\u2022 ","color":"dark_aqua"},{"text":"Marksman","color":"dark_aqua","clickEvent":{"action":"run_command","value":"/scoreboard players set @s kit 4"}},{"text":"\\n\\u2022 ","color":"dark_aqua"},{"text":"Armourer","color":"dark_aqua","clickEvent":{"action":"run_command","value":"/scoreboard players set @s kit 5"}},{"text":"\\n\\u2022 ","color":"dark_aqua"},{"text":"Summoner","color":"dark_aqua","clickEvent":{"action":"run_command","value":"/scoreboard players set @s kit 6"}},{"text":"\\n\\u2022 ","color":"dark_aqua"},{"text":"Farmer","color":"dark_aqua","clickEvent":{"action":"run_command","value":"/scoreboard players set @s kit 7"}},{"text":"\\n\\u2022 ","color":"dark_aqua"},{"text":"Fisherman","color":"dark_aqua","clickEvent":{"action":"run_command","value":"/scoreboard players set @s kit 8"}}]'],title:"Kit Selector",author:"Nixinova",display:{Name:'"\\u00A7eKit Selector"',Lore:['"\\u00A7aSelect a kit"']},HideFlags:127}
+item replace entity @a[team=lobby,x=25,y=138,z=1,distance=..10] hotbar.4 with air
+item replace entity @a[team=lobby,x=25,y=138,z=1,distance=..10] hotbar.5 with written_book{pages:['[{"text":"\\u00A7cChoose a cage:\\u00A7r\\n"},{"text":"\\n\\u2022 Default","color":"reset","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 0"}},{"text":"\\n\\u2022 None","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 1"}},{"text":"\\n\\u2022 Glass: "},{"text":"\\u25a0","color":"blue","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 2"}},{"text":"\\u25a0","color":"green","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 3"}},{"text":"\\u25a0","color":"dark_aqua","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 4"}},{"text":"\\u25a0","color":"red","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 5"}},{"text":"\\u25a0","color":"light_purple","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 6"}},{"text":"\\u25a0","color":"yellow","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 7"}},{"text":"\\u25a0","color":"dark_blue","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 8"}},{"text":"\\u25a0","color":"dark_green","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 9"}},{"text":"\\u25a0","color":"dark_gray","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 10"}},{"text":"\\u25a0","color":"black","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 11"}},{"text":"\\n\\u2022 Iron","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 12"}},{"text":"\\n\\u2022 Wood","clickEvent":{"action":"run_command","value":"/scoreboard players set @s cage 13"}}]'],title:"Cage Selector",author:"Nixinova",display:{Name:'"\\u00A7eCage Selector"',Lore:['"\\u00A7aChoose a cage"']},HideFlags:127}
+item replace entity @a[team=lobby,x=25,y=138,z=1,distance=..10] hotbar.6 with air
+item replace entity @a[team=lobby,x=25,y=138,z=1,distance=..10] hotbar.7 with air
+item replace entity @a[team=lobby,x=25,y=138,z=1,distance=..10] hotbar.8 with air
 
 # Lobby commands
 kill @e[type=item,x=25,y=138,z=1,distance=..10]
@@ -42,4 +42,4 @@ execute as @a[team=spectator,x=0,y=-256,z=0,distance=..256] run tp @s ~ 64 ~
 kill @a[team=playing,x=0,y=-256,z=0,distance=..256]
 
 # World commands
-weather clear
+weather clear

data/skywars/functions/goldrush/start.mcfunction

@@ -1,11 +1,11 @@
-#---------------------------------
-#                                 
-#      SKYWARS : GOLD RUSH        
-#          by Nixinova            
-#                                 
-#      Game starting commands      
-#                                 
-#---------------------------------
+#---------------------------------#
+#                                 #
+#      SKYWARS : GOLD RUSH        #
+#          by Nixinova            #
+#                                 #
+#      Game starting commands     #
+#                                 #
+#---------------------------------#
 
 scoreboard players set ingame players 1
 
@@ -22,8 +22,7 @@ effect give @a[team=playing] minecraft:resistance 15 4
 
 setblock 24 206 7 redstone_block
 
-#tellraw @a[team=playing] {"text":"Resetting map, expect lag...","color":"red","italic":true}
-title @a[team=playing] actionbar {"text":"Resetting map","color":"red"}
+title @a[team=playing] actionbar {"text":"Resetting map...","color":"red"}
 function skywars:goldrush/clearmap
 title @a[team=playing] actionbar {"text":"Map cleared.","color":"green"}
 title @a[team=playing] actionbar {"text":"Loading new map...","color":"yellow"}
@@ -113,4 +112,4 @@ give @a[team=playing,scores={kit=7}] bread 8
 
 # Fisherman
 give @a[team=playing,scores={kit=8}] fishing_rod{Enchantments:[{id:"minecraft:knockback",lvl:1}]}
-give @a[team=playing,scores={kit=8}] cod 12
+give @a[team=playing,scores={kit=8}] cod 12

data/skywars/functions/goldrush/winner.mcfunction

@@ -1,11 +1,11 @@
-#---------------------------------
-#                                 
-#      SKYWARS : GOLD RUSH        
-#          by Nixinova            
-#                                 
-#       Finishing commands      
-#                                 
-#---------------------------------
+#---------------------------------#
+#                                 #
+#      SKYWARS : GOLD RUSH        #
+#          by Nixinova            #
+#                                 #
+#       Finishing commands        #
+#                                 #
+#---------------------------------#
 
 scoreboard players set ingame players 0
 
@@ -19,4 +19,5 @@ title @a subtitle {"text":"has won!","color":"green"}
 tp @a 25 138 1
 gamemode adventure @a
 team join lobby @a
-clear @a
+clear @a
+execute at @a run playsound entity.ender_dragon.ambient ambient @p