From 40c284736604fb05a025b43176b4c2a5160a7909 Mon Sep 17 00:00:00 2001 From: Adubbz Date: Tue, 7 May 2013 18:19:09 +1000 Subject: [PATCH] Fixed flowers/thorns once and for all --- .../biomesoplenty/blocks/BlockBOPFlower.java | 16 ++++++++-------- .../biomesoplenty/blocks/BlockBOPFoliage.java | 5 ++--- .../biomesoplenty/blocks/BlockBOPPlant.java | 6 +++--- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/minecraft/biomesoplenty/blocks/BlockBOPFlower.java b/src/minecraft/biomesoplenty/blocks/BlockBOPFlower.java index df1101e99..b520e6f9c 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockBOPFlower.java +++ b/src/minecraft/biomesoplenty/blocks/BlockBOPFlower.java @@ -150,31 +150,31 @@ public class BlockBOPFlower extends BlockFlower { int id = world.getBlockId(x, y - 1, z); int meta = itemStack.getItemDamage(); - boolean sky = world.getFullBlockLightValue(x, y, z) >= 8 || world.canBlockSeeTheSky(x, y, z); + //boolean sky = world.getFullBlockLightValue(x, y, z) >= 8 || world.canBlockSeeTheSky(x, y, z); if (itemStack.itemID == this.blockID) switch (meta) { case 10: // Toadstool - return sky && 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 - return sky && id == Blocks.redRock.get().blockID || id == Block.sand.blockID; + return id == Blocks.redRock.get().blockID || id == Block.sand.blockID; case 12: // Yucca - return sky && 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; case 13: // Portobello - return sky && 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 14: // Blue Milk Cap - return sky && id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.mycelium.blockID || id == Blocks.holyGrass.get().blockID; + return id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.mycelium.blockID || id == Blocks.holyGrass.get().blockID; default: - return sky && id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.tilledField.blockID; + return id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.tilledField.blockID; } else - return sky && this.canPlaceBlockOnSide(world, x, y, z, side); + return this.canPlaceBlockOnSide(world, x, y, z, side); } /*@Override diff --git a/src/minecraft/biomesoplenty/blocks/BlockBOPFoliage.java b/src/minecraft/biomesoplenty/blocks/BlockBOPFoliage.java index da07b3b66..e03cdc321 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockBOPFoliage.java +++ b/src/minecraft/biomesoplenty/blocks/BlockBOPFoliage.java @@ -169,9 +169,8 @@ public class BlockBOPFoliage extends BlockFlower implements IShearable { int meta = par1World.getBlockMetadata(x, y, z); - if (!par1World.isRemote) - if (meta == 6) - ((EntityLiving)par5Entity).addPotionEffect(new PotionEffect(Potion.poison.id, 200)); + if (!par1World.isRemote && meta == 6) + ((EntityLiving)par5Entity).addPotionEffect(new PotionEffect(Potion.poison.id, 200)); } @Override diff --git a/src/minecraft/biomesoplenty/blocks/BlockBOPPlant.java b/src/minecraft/biomesoplenty/blocks/BlockBOPPlant.java index b5226f6de..73ef60955 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockBOPPlant.java +++ b/src/minecraft/biomesoplenty/blocks/BlockBOPPlant.java @@ -144,7 +144,7 @@ public class BlockBOPPlant extends BlockFlower implements IShearable return id == Blocks.holyGrass.get().blockID; case 5: // Thorns - return true; + return id == Block.grass.blockID || id == Block.dirt.blockID; case 7: // Cattail return id != Block.grass.blockID ? false : (world.getBlockMaterial(x - 1, y - 1, z) == Material.water ? true : (world.getBlockMaterial(x + 1, y - 1, z) == Material.water ? true : (world.getBlockMaterial(x, y - 1, z - 1) == Material.water ? true : world.getBlockMaterial(x, y - 1, z + 1) == Material.water))); @@ -162,7 +162,7 @@ public class BlockBOPPlant extends BlockFlower implements IShearable return this.canPlaceBlockOnSide(world, x, y, z, side); } - @Override + /*@Override public boolean canBlockStay(World world, int x, int y, int z) { if (world.getBlockId(x, y, z) != this.blockID) @@ -171,7 +171,7 @@ public class BlockBOPPlant extends BlockFlower implements IShearable else return (world.getFullBlockLightValue(x, y, z) >= 8 || world.canBlockSeeTheSky(x, y, z)) && this.canThisPlantGrowOnThisBlockID(world.getBlockId(x, y - 1, z), world.getBlockMetadata(x, y, z)); - } + }*/ @Override public void onNeighborBlockChange(World world, int x, int y, int z, int neighborID)