fix spawn block not being replaced by air when not ignoring air

MelanX · Apr 22, 2024 · 51c489d · 51c489d
1 parent 9a38a01
commit 51c489d
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/main/java/de/melanx/skyblockbuilder/util/RandomUtility.java b/src/main/java/de/melanx/skyblockbuilder/util/RandomUtility.java
@@ -17,6 +17,7 @@
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
@@ -111,7 +112,12 @@ public static Set<TemplatesConfig.Spawn> fillTemplateFromWorld(StructureTemplate
                     if (state.is(ModBlocks.spawnBlock)) {
                         WorldUtil.Directions direction = WorldUtil.Directions.fromDirection(state.getValue(BlockStateProperties.HORIZONTAL_FACING));
                         spawns.add(new TemplatesConfig.Spawn(relPos, direction));
-                        continue;
+                        // prevent spawn block being replaced by solid block in a cave
+                        if (toIgnore.contains(Blocks.AIR)) {
+                            continue;
+                        }
+
+                        state = Blocks.AIR.defaultBlockState();
                     }
                     BlockEntity blockEntity = level.getBlockEntity(actPos);
                     StructureTemplate.StructureBlockInfo blockInfo;