From ee99b1fcccddfbf5bb7af408469a7676a2da8771 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Tue, 6 Dec 2016 13:40:51 +0100 Subject: [PATCH] Make the Leaf Blower work with all shearable things Closes #456 --- build.gradle | 2 +- .../ellpeck/actuallyadditions/mod/items/ItemLeafBlower.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 50027beba..b0fa9e04f 100644 --- a/build.gradle +++ b/build.gradle @@ -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" diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLeafBlower.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLeafBlower.java index 9b486c689..1509ab2cb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLeafBlower.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLeafBlower.java @@ -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); } }