aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/item
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2017-04-01 15:46:54 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2017-04-01 15:46:54 +1000
commit52948f0a38884dc9f0df4bb3ab93b6079ca39bc1 (patch)
tree5afdcf58ad5fc83b50256b7108b0286b5c1fdbc6 /src/Java/gtPlusPlus/core/item
parentd52e0b6a6adde20bc6737db9370ad8df8ec83ed4 (diff)
downloadGT5-Unofficial-52948f0a38884dc9f0df4bb3ab93b6079ca39bc1.tar.gz
GT5-Unofficial-52948f0a38884dc9f0df4bb3ab93b6079ca39bc1.tar.bz2
GT5-Unofficial-52948f0a38884dc9f0df4bb3ab93b6079ca39bc1.zip
$ Hopefully fixed broken durability bars for multi-pickaxes.
Diffstat (limited to 'src/Java/gtPlusPlus/core/item')
-rw-r--r--src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java3
-rw-r--r--src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java4
2 files changed, 3 insertions, 4 deletions
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;