From e70dcda57ef1b1523364ffb9d27c09a715d5becb Mon Sep 17 00:00:00 2001 From: jodamm Date: Sat, 2 Aug 2014 21:17:49 +0200 Subject: [PATCH] * fix for #527 Lumber Axe destroys indestructible blocks * fix for Excavator and Hammer behaving wrong under water --- src/main/java/tconstruct/items/tools/Excavator.java | 2 +- src/main/java/tconstruct/items/tools/Hammer.java | 2 +- src/main/java/tconstruct/items/tools/LumberAxe.java | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/tconstruct/items/tools/Excavator.java b/src/main/java/tconstruct/items/tools/Excavator.java index 569eaa7f..d4349037 100644 --- a/src/main/java/tconstruct/items/tools/Excavator.java +++ b/src/main/java/tconstruct/items/tools/Excavator.java @@ -162,7 +162,7 @@ public class Excavator extends HarvestTool } } - MovingObjectPosition mop = AbilityHelper.raytraceFromEntity(world, player, true, 5.0D); + MovingObjectPosition mop = AbilityHelper.raytraceFromEntity(world, player, false, 5.0D); if (mop == null || !validStart) return super.onBlockStartBreak(stack, x, y, z, player); diff --git a/src/main/java/tconstruct/items/tools/Hammer.java b/src/main/java/tconstruct/items/tools/Hammer.java index 4b203ae0..ab644e03 100644 --- a/src/main/java/tconstruct/items/tools/Hammer.java +++ b/src/main/java/tconstruct/items/tools/Hammer.java @@ -259,7 +259,7 @@ public class Hammer extends HarvestTool if (block == Blocks.monster_egg) validStart = true; - MovingObjectPosition mop = AbilityHelper.raytraceFromEntity(world, player, true, 4.5D); + MovingObjectPosition mop = AbilityHelper.raytraceFromEntity(world, player, false, 4.5D); if (mop == null || !validStart) return super.onBlockStartBreak(stack, x, y, z, player); diff --git a/src/main/java/tconstruct/items/tools/LumberAxe.java b/src/main/java/tconstruct/items/tools/LumberAxe.java index 3d3b687a..949fe621 100644 --- a/src/main/java/tconstruct/items/tools/LumberAxe.java +++ b/src/main/java/tconstruct/items/tools/LumberAxe.java @@ -211,8 +211,9 @@ public class LumberAxe extends HarvestTool { int localMeta = world.getBlockMetadata(xPos, yPos, zPos); int hlvl = localBlock.getHarvestLevel(localMeta); + float localHardness = localBlock == null ? Float.MAX_VALUE : localBlock.getBlockHardness(world, xPos, yPos, zPos); - if (hlvl <= tags.getInteger("HarvestLevel")) + if (hlvl <= tags.getInteger("HarvestLevel") && !(localHardness < 0)) { boolean cancelHarvest = false; for (ActiveToolMod mod : TConstructRegistry.activeModifiers) @@ -286,8 +287,9 @@ public class LumberAxe extends HarvestTool Block localBlock = world.getBlock(xPos, yPos, zPos); int localMeta = world.getBlockMetadata(xPos, yPos, zPos); int hlvl = localBlock.getHarvestLevel(localMeta); + float localHardness = localBlock == null ? Float.MAX_VALUE : localBlock.getBlockHardness(world, xPos, yPos, zPos); - if (localBlock != null && localBlock.getMaterial() == Material.wood) + if (localBlock != null && localBlock.getMaterial() == Material.wood && !(localHardness < 0)) { if (hlvl <= tags.getInteger("HarvestLevel")) {