Merge branch 'master' of github.com:micdoodle8/MinecraftForge into micdoodle8-master

This commit is contained in:
Christian 2013-09-13 20:06:50 -05:00
commit 391668114d
1 changed files with 1 additions and 1 deletions

View File

@ -24,7 +24,7 @@
- if (par1World.getBlockId(j1, par3, k1) == 0 && (l1 == Block.tilledField.blockID || l1 == Block.dirt.blockID || l1 == Block.grass.blockID))
+ boolean isSoil = (blocksList[l1] != null && blocksList[l1].canSustainPlant(par1World, j1, par3 - 1, k1, ForgeDirection.UP, this));
+ if (par1World.getBlockId(j1, par3, k1) == 0 && (isSoil || l1 == Block.dirt.blockID || l1 == Block.grass.blockID))
+ if (par1World.isAirBlock(j1, par3, k1) && (isSoil || l1 == Block.dirt.blockID || l1 == Block.grass.blockID))
{
par1World.setBlock(j1, par3, k1, this.fruitType.blockID);
}