etc
/
BiomesOPlenty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed a crash with Thaumcraft. Closes #597

This commit is contained in:
Adubbz 2016-01-13 09:26:51 +11:00
parent c25dcedc13
commit 41a40a5370
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/biomesoplenty/common/block/BlockBOPFlower.java
View File

@ -303,12 +303,17 @@ public class BlockBOPFlower extends BlockBOPDecoration implements IShearable
public void dropBlockAsItemWithChance(World world, BlockPos pos, IBlockState state, float chance, int fortune)
{
EntityPlayer player = this.harvesters.get();
boolean usingShears = (player.getCurrentEquippedItem() != null && player.getCurrentEquippedItem().getItem() instanceof ItemShears);
//Player must use shears when flowerDropsNeedShears is enabled
if (GameplayConfigurationHandler.flowerDropsNeedShears && !usingShears)
return;
//Only check if shears are being using if the appropriate option is enabled, and it's a player harvesting this block
if (GameplayConfigurationHandler.flowerDropsNeedShears && player != null)
{
boolean usingShears = (player.getCurrentEquippedItem() != null && player.getCurrentEquippedItem().getItem() instanceof ItemShears);
//Player must use shears when flowerDropsNeedShears is enabled
if (!usingShears)
return;
}
super.dropBlockAsItemWithChance(world, pos, state, chance, fortune);
}