Merge branch 'master' of github.com:mcMMO-Dev/mcMMO

This commit is contained in:
nossr50 2012-02-14 14:43:53 -08:00
commit 7cf549ba88

View File

@ -104,9 +104,9 @@ public class Herbalism
if(hasSeeds(player) && block.getType() != Material.WHEAT) if(hasSeeds(player) && block.getType() != Material.WHEAT)
{ {
removeSeeds(player); removeSeeds(player);
if(block.getType() == Material.SMOOTH_BRICK) if(LoadProperties.enableSmoothToMossy && block.getType() == Material.SMOOTH_BRICK)
block.setData((byte)1); block.setData((byte)1);
if(block.getType() == Material.DIRT) if(LoadProperties.enableDirtToGrass && block.getType() == Material.DIRT)
block.setType(Material.GRASS); block.setType(Material.GRASS);
if(LoadProperties.enableCobbleToMossy && block.getType() == Material.COBBLESTONE) if(LoadProperties.enableCobbleToMossy && block.getType() == Material.COBBLESTONE)
block.setType(Material.MOSSY_COBBLESTONE); block.setType(Material.MOSSY_COBBLESTONE);