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

Make BlockDoubleDecoration shearing more robust by adding a check for valid blocks

This commit is contained in:
Cheeserolls 2015-05-06 13:32:23 +01:00
parent c921b36485
commit 89937a09de
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/biomesoplenty/common/block/BlockDoubleDecoration.java
View File

@ -10,6 +10,7 @@ package biomesoplenty.common.block;
import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.IProperty;
import net.minecraft.block.properties.PropertyEnum;
@ -104,7 +105,9 @@ public class BlockDoubleDecoration extends BlockDecoration {
{
IBlockState lowerState = this.getLowerState(world, pos);
IBlockState upperState = this.getUpperState(world, pos);
return lowerState.getBlock() == this && lowerState.getValue(HALF) == Half.LOWER && upperState.getBlock() == this && upperState.getValue(HALF) == Half.UPPER;
Block lowerBlock = lowerState.getBlock();
Block upperBlock = upperState.getBlock();
return (lowerBlock instanceof BlockDoubleDecoration) && (upperBlock instanceof BlockDoubleDecoration) && (lowerBlock == upperBlock) && lowerState.getValue(HALF) == Half.LOWER && upperState.getValue(HALF) == Half.UPPER;
}
@ -209,6 +212,7 @@ public class BlockDoubleDecoration extends BlockDecoration {
public List<ItemStack> onSheared(ItemStack item, IBlockAccess world, BlockPos pos, int fortune) {
List<ItemStack> drops = new java.util.ArrayList<ItemStack>();
if (!this.isValidDoubleBlock(world, pos)) {return drops;}
drops.addAll( this.getUpperShearDrops(item, world, this.getUpperPos(world, pos), this.getUpperState(world, pos), fortune) );
drops.addAll( this.getLowerShearDrops(item, world, this.getLowerPos(world, pos), this.getLowerState(world, pos), fortune) );