Merged Forstride's BlockBOPFlower changes

This commit is contained in:
Adubbz 2013-05-05 11:34:32 +10:00
parent 4348490256
commit 62267f5dc8

View file

@ -105,7 +105,7 @@ public class BlockBOPFlower extends BlockFlower
protected boolean canThisPlantGrowOnThisBlockID(int id) protected boolean canThisPlantGrowOnThisBlockID(int id)
{ {
return id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.tilledField.blockID || id == Block.sand.blockID; return id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.tilledField.blockID || id == Block.sand.blockID || id == Blocks.hardDirt.get().blockID || id == Blocks.redRock.get().blockID;
} }
protected boolean canThisPlantGrowOnThisBlockID(int id, int metadata) protected boolean canThisPlantGrowOnThisBlockID(int id, int metadata)
@ -133,7 +133,7 @@ public class BlockBOPFlower extends BlockFlower
return id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.mycelium.blockID; return id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.mycelium.blockID;
case 11: // Cactus case 11: // Cactus
return id == Block.sand.blockID; return id == Blocks.redRock.get().blockID || id == Block.sand.blockID;
case 12: // Yucca case 12: // Yucca
return id == Blocks.hardDirt.get().blockID || id == Blocks.redRock.get().blockID || id == Block.sand.blockID; return id == Blocks.hardDirt.get().blockID || id == Blocks.redRock.get().blockID || id == Block.sand.blockID;