From 52948f0a38884dc9f0df4bb3ab93b6079ca39bc1 Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Sat, 1 Apr 2017 15:46:54 +1000 Subject: $ Hopefully fixed broken durability bars for multi-pickaxes. --- src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java | 3 ++- src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'src/Java/gtPlusPlus/core') diff --git a/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java b/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java index 871c286bc7..602b0d75f7 100644 --- a/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java +++ b/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java @@ -295,7 +295,8 @@ public class MultiPickaxeBase extends StaballoyPickaxe{ * */ - public boolean isDamageable(){ + @Override + public boolean isDamageable(){ if (this.getMaxDamage() > 0 && !this.hasSubtypes){ if (this.canBreak){ return true; diff --git a/src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java b/src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java index fadfdf05c3..a73ae3045c 100644 --- a/src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java +++ b/src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java @@ -22,9 +22,7 @@ public class StaballoyPickaxe extends ItemPickaxe{ */ @Override public double getDurabilityForDisplay(final ItemStack stack) { - if (super.getDurabilityForDisplay(stack) > 0){ - return super.getDurabilityForDisplay(stack);} - return 0; + return (double)stack.getItemDamageForDisplay() / (double)stack.getMaxDamage(); } protected Boolean FACING_HORIZONTAL = true; -- cgit