Merged Amnet's changes that i missed

This commit is contained in:
Adubbz 2013-05-07 18:24:45 +10:00
parent 40c2847366
commit 043e749df4
2 changed files with 3 additions and 2 deletions

View file

@ -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)

View file

@ -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);
}