diff options
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/com/detrav/gui/containers/DetravPortableAnvilContainer.java | 6 | ||||
| -rw-r--r-- | src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/main/java/com/detrav/gui/containers/DetravPortableAnvilContainer.java b/src/main/java/com/detrav/gui/containers/DetravPortableAnvilContainer.java index 1dc0b4aa50..fb18b539f3 100644 --- a/src/main/java/com/detrav/gui/containers/DetravPortableAnvilContainer.java +++ b/src/main/java/com/detrav/gui/containers/DetravPortableAnvilContainer.java @@ -63,10 +63,8 @@ public class DetravPortableAnvilContainer extends Container { p_75134_1_.dropPlayerItemWithRandomChoice(itemstack, false); } itemstack = this.slots.getStackInSlot(1); - if (itemstack != null) { - if (stack == null || !DetravMetaGeneratedTool01.INSTANCE.setItemStackToDetravData(stack, itemstack)) { - p_75134_1_.dropPlayerItemWithRandomChoice(itemstack, false); - } + if (stack == null || !DetravMetaGeneratedTool01.INSTANCE.setItemStackToDetravData(stack, itemstack)) { + p_75134_1_.dropPlayerItemWithRandomChoice(itemstack, false); } //itemstack.writeToNBT() } diff --git a/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java b/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java index 3bcb293b51..276d67518a 100644 --- a/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java +++ b/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java @@ -137,9 +137,9 @@ public class DetravMetaGeneratedTool01 extends GT_MetaGenerated_Tool { public boolean setItemStackToDetravData(ItemStack aStack, ItemStack what) { - if(what == null || aStack == null) return false; + if(aStack == null) return false; NBTTagCompound aNBT = aStack.getTagCompound(); - if(aNBT ==null) { + if(aNBT == null) { aNBT = new NBTTagCompound(); NBTTagCompound detravData = new NBTTagCompound(); aNBT.setTag("DetravData", detravData); @@ -147,12 +147,14 @@ public class DetravMetaGeneratedTool01 extends GT_MetaGenerated_Tool { } { NBTTagCompound detravData = aNBT.getCompoundTag("DetravData"); - if (detravData == null || detravData.getShort("id") == 0 ) - { + if (detravData == null || detravData.getShort("id") == 0) { detravData = new NBTTagCompound(); aNBT.setTag("DetravData", detravData); } - what.writeToNBT(detravData); + if (what == null) + aNBT.removeTag("DetravData"); + else + what.writeToNBT(detravData); return true; } } |