From 043e749df4376b26023daf77cdb0c09ea3320282 Mon Sep 17 00:00:00 2001 From: Adubbz Date: Tue, 7 May 2013 18:24:45 +1000 Subject: [PATCH] Merged Amnet's changes that i missed --- src/minecraft/biomesoplenty/blocks/BlockBOPPlant.java | 2 +- src/minecraft/biomesoplenty/worldgen/WorldGenBOPFlowers.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/minecraft/biomesoplenty/blocks/BlockBOPPlant.java b/src/minecraft/biomesoplenty/blocks/BlockBOPPlant.java index 73ef60955..17edbf5a1 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockBOPPlant.java +++ b/src/minecraft/biomesoplenty/blocks/BlockBOPPlant.java @@ -104,7 +104,7 @@ public class BlockBOPPlant extends BlockFlower implements IShearable else if (metadata == 4) //Holy Tall Grass return blockID == Blocks.holyGrass.get().blockID; else if (metadata == 5) - return true; + return blockID == Block.grass.blockID || blockID == Block.dirt.blockID; else if (metadata == 7) return blockID == Block.grass.blockID; else if (metadata == 8) diff --git a/src/minecraft/biomesoplenty/worldgen/WorldGenBOPFlowers.java b/src/minecraft/biomesoplenty/worldgen/WorldGenBOPFlowers.java index f04bbd4ec..cbcea4347 100644 --- a/src/minecraft/biomesoplenty/worldgen/WorldGenBOPFlowers.java +++ b/src/minecraft/biomesoplenty/worldgen/WorldGenBOPFlowers.java @@ -26,7 +26,8 @@ public class WorldGenBOPFlowers extends WorldGenerator int j1 = par4 + par2Random.nextInt(4) - par2Random.nextInt(4); int k1 = par5 + par2Random.nextInt(8) - par2Random.nextInt(8); - if (par1World.isAirBlock(i1, j1, k1) && (!par1World.provider.hasNoSky || j1 < 127) && Block.blocksList[this.plantBlockId].canPlaceBlockOnSide(par1World, i1, j1, k1, 1, new ItemStack(this.plantBlockId, 1, this.plantBlockMeta))) + if (par1World.isAirBlock(i1, j1, k1) && (!par1World.provider.hasNoSky || j1 < 127) && (par1World.getFullBlockLightValue(i1, j1, k1) >= 8 || par1World.canBlockSeeTheSky(i1, j1, k1)) + && Block.blocksList[this.plantBlockId].canPlaceBlockOnSide(par1World, i1, j1, k1, 1, new ItemStack(this.plantBlockId, 1, this.plantBlockMeta))) { par1World.setBlock(i1, j1, k1, this.plantBlockId, this.plantBlockMeta, 2); }