Refine structure placement logic

jss2a98aj · Mar 7, 2024 · 3e92d9e · 3e92d9e
1 parent 69c5e52
commit 3e92d9e
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/main/java/jss/bugtorch/mixins/early/minecraft/worldgen/MixinWorld.java b/src/main/java/jss/bugtorch/mixins/early/minecraft/worldgen/MixinWorld.java
@@ -2,6 +2,7 @@
 
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockLog;
+import net.minecraft.block.material.Material;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.Chunk;
@@ -19,11 +20,12 @@ public abstract class MixinWorld implements IBlockAccess {
     @Overwrite
 	public int getTopSolidOrLiquidBlock(int x, int z) {
 		Chunk chunk = getChunkFromBlockCoords(x, z);
-		int chunkX = x &= 15;
-		int chunkZ = z &= 15;
+		int chunkX = x & 15;
+		int chunkZ = z & 15;
 		for(int y = chunk.getTopFilledSegment() + 15; y > 0; --y) {
 			Block block = chunk.getBlock(chunkX, y, chunkZ);
-			if(block.getMaterial().blocksMovement() && !block.isLeaves(this, x, y, z) && !block.isFoliage(this, x, y, z) && !(block instanceof BlockLog)) {
+            Material material = block.getMaterial();
+			if(material.isLiquid() || (material.blocksMovement() && !material.isReplaceable() && !block.isLeaves(this, x, y, z) && !block.isFoliage(this, x, y, z) && !(block instanceof BlockLog))) {
 				return y + 1;
 			}
 		}