Make the Leaf Blower work with all shearable things

Closes #456
This commit is contained in:
Ellpeck 2016-12-06 13:40:51 +01:00
parent 7c0ca04e85
commit ee99b1fccc
2 changed files with 4 additions and 2 deletions

View file

@ -23,7 +23,7 @@ if(hasProperty('buildnumber')){
}
minecraft {
version = "1.11-13.19.0.2180"
version = "1.11-13.19.1.2188"
runDir = "idea"
mappings = "snapshot_20161126"

View file

@ -29,6 +29,7 @@ import net.minecraft.util.SoundCategory;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
import net.minecraft.world.World;
import net.minecraftforge.common.IShearable;
import java.util.ArrayList;
import java.util.Collections;
@ -105,7 +106,8 @@ public class ItemLeafBlower extends ItemBase implements IDisplayStandItem{
//The current Block to break
BlockPos pos = new BlockPos(x+reachX, y+reachY, z+reachZ);
Block block = world.getBlockState(pos).getBlock();
if(block != null && (block instanceof BlockBush || (this.isAdvanced && block.isLeaves(world.getBlockState(pos), world, pos)))){
if(block != null && ((block instanceof BlockBush || block instanceof IShearable) && (this.isAdvanced || !block.isLeaves(world.getBlockState(pos), world, pos)))){
breakPositions.add(pos);
}
}