From b3560aaa00412cb76ba4e02118104f1a6a358202 Mon Sep 17 00:00:00 2001 From: Sebastian Hartte Date: Sat, 5 Nov 2016 12:57:47 +0100 Subject: [PATCH] Fixes #2571: Only call getDurabilityForDisplay if the item is damageable. --- src/main/java/appeng/util/item/AEItemStack.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/appeng/util/item/AEItemStack.java b/src/main/java/appeng/util/item/AEItemStack.java index d81e0c85d..d6f772837 100644 --- a/src/main/java/appeng/util/item/AEItemStack.java +++ b/src/main/java/appeng/util/item/AEItemStack.java @@ -26,7 +26,6 @@ import java.io.DataOutputStream; import java.io.IOException; import java.security.InvalidParameterException; import java.util.List; - import javax.annotation.Nullable; import io.netty.buffer.ByteBuf; @@ -92,7 +91,14 @@ public final class AEItemStack extends AEStack implements IAEItemS * Kinda hackery */ this.getDefinition().setDamageValue( this.def.getDamageValueHack( is ) ); - this.getDefinition().setDisplayDamage( (int) ( is.getItem().getDurabilityForDisplay( is ) * Integer.MAX_VALUE ) ); + if( !is.getItem().isDamageable() ) + { + this.getDefinition().setDisplayDamage( Integer.MAX_VALUE ); + } + else + { + this.getDefinition().setDisplayDamage( (int) ( is.getItem().getDurabilityForDisplay( is ) * Integer.MAX_VALUE ) ); + } this.getDefinition().setMaxDamage( is.getMaxDamage() ); final NBTTagCompound tagCompound = is.getTagCompound();