From 5124e3c971054942e106a0ca540648d31e3325c2 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Mon, 16 Mar 2015 17:06:28 +0000 Subject: [PATCH] Fixed the Jaded Amarathus not being inclusive of other mods' soil blocks. Closes #659 --- .../block/subtile/functional/SubTileJadedAmaranthus.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJadedAmaranthus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJadedAmaranthus.java index 1c97e7385..13cf2c2b8 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJadedAmaranthus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJadedAmaranthus.java @@ -37,9 +37,8 @@ public class SubTileJadedAmaranthus extends SubTileFunctional { int z = supertile.zCoord - range + supertile.getWorldObj().rand.nextInt(range * 2 + 1); for(int i = 0; i < range * 2; i++) { - Block block = supertile.getWorldObj().getBlock(x, y, z); Block blockAbove = supertile.getWorldObj().getBlock(x, y + 1, z); - if((block == Blocks.grass || block == Blocks.dirt || block == Blocks.farmland) && (supertile.getWorldObj().isAirBlock(x, y + 1, z) || blockAbove.isReplaceable(supertile.getWorldObj(), x, y + 1, z) && blockAbove.getMaterial() != Material.water)) { + if((supertile.getWorldObj().isAirBlock(x, y + 1, z) || blockAbove.isReplaceable(supertile.getWorldObj(), x, y + 1, z)) && blockAbove.getMaterial() != Material.water && ModBlocks.flower.canPlaceBlockAt(supertile.getWorldObj(), x, y + 1, z)) { int color = supertile.getWorldObj().rand.nextInt(16); if(ModBlocks.flower.canBlockStay(supertile.getWorldObj(), x, y + 1, z)) { if(ConfigHandler.blockBreakParticles)