Merge lobby structures into one per lobby

wurstmineberg · Sep 14, 2020 · 249c8e9 · 249c8e9
1 parent 9ff55dd
commit 249c8e9
Show file tree

Hide file tree

Showing 11 changed files with 2 additions and 8 deletions.
diff --git a/data/usc/functions/place_lobby.mcfunction b/data/usc/functions/place_lobby.mcfunction
@@ -1,16 +1,10 @@
 # place both lobbies, called from load.mcfunction
 function usc:kill_lobby_entities
 # pregame lobby
-setblock -1 199 -1 minecraft:structure_block[mode="load"]{mode:"LOAD",name:"usc:lobby_pregame_nw",ignoreEntities:1b,posX:-16,posY:0,posZ:-16}
-setblock 0 199 -1 minecraft:structure_block[mode="load"]{mode:"LOAD",name:"usc:lobby_pregame_ne",ignoreEntities:1b,posX:0,posY:0,posZ:-16}
-setblock -1 199 0 minecraft:structure_block[mode="load"]{mode:"LOAD",name:"usc:lobby_pregame_sw",ignoreEntities:1b,posX:-16,posY:0,posZ:0}
-setblock 0 199 0 minecraft:structure_block[mode="load"]{mode:"LOAD",name:"usc:lobby_pregame_se",ignoreEntities:1b,posX:0,posY:0,posZ:0}
+setblock -1 199 -1 minecraft:structure_block[mode="load"]{mode:"LOAD",name:"usc:lobby_pregame",ignoreEntities:1b,posX:-16,posY:0,posZ:-16}
 fill -1 200 -1 0 200 0 minecraft:redstone_block
 # game lobby
-setblock -1 0 -1 minecraft:structure_block[mode="load"]{mode:"LOAD",name:"usc:lobby_game_nw",ignoreEntities:1b,posX:-17,posY:0,posZ:-17}
-setblock 0 0 -1 minecraft:structure_block[mode="load"]{mode:"LOAD",name:"usc:lobby_game_ne",ignoreEntities:1b,posX:0,posY:0,posZ:-17}
-setblock -1 0 0 minecraft:structure_block[mode="load"]{mode:"LOAD",name:"usc:lobby_game_sw",ignoreEntities:1b,posX:-17,posY:0,posZ:0}
-setblock 0 0 0 minecraft:structure_block[mode="load"]{mode:"LOAD",name:"usc:lobby_game_se",ignoreEntities:1b,posX:0,posY:0,posZ:0}
+setblock -1 0 -1 minecraft:structure_block[mode="load"]{mode:"LOAD",name:"usc:lobby_game",ignoreEntities:1b,posX:-17,posY:0,posZ:-17}
 fill -1 1 -1 0 1 0 minecraft:redstone_block
 # kill entities again to get rid of drops
 schedule function usc:kill_lobby_entities 1s
diff --git a/data/usc/structures/lobby_game.nbt b/data/usc/structures/lobby_game.nbt
diff --git a/data/usc/structures/lobby_game_ne.nbt b/data/usc/structures/lobby_game_ne.nbt
diff --git a/data/usc/structures/lobby_game_nw.nbt b/data/usc/structures/lobby_game_nw.nbt
diff --git a/data/usc/structures/lobby_game_se.nbt b/data/usc/structures/lobby_game_se.nbt
diff --git a/data/usc/structures/lobby_game_sw.nbt b/data/usc/structures/lobby_game_sw.nbt
diff --git a/data/usc/structures/lobby_pregame.nbt b/data/usc/structures/lobby_pregame.nbt
diff --git a/data/usc/structures/lobby_pregame_ne.nbt b/data/usc/structures/lobby_pregame_ne.nbt
diff --git a/data/usc/structures/lobby_pregame_nw.nbt b/data/usc/structures/lobby_pregame_nw.nbt
diff --git a/data/usc/structures/lobby_pregame_se.nbt b/data/usc/structures/lobby_pregame_se.nbt
diff --git a/data/usc/structures/lobby_pregame_sw.nbt b/data/usc/structures/lobby_pregame_sw.nbt