From f27511c1d1777d49dcd5dd2b1fcd93510e086ac5 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Wed, 21 Jun 2017 19:14:25 -0700 Subject: [PATCH] Fix ItemStackWrapper ignoring stack's NBT (#1155) who even made this class i mean come on this is such a stupid thing to do like omgwtf what a moron (cherry picked from commit 8c12b48) --- .../java/WayofTime/bloodmagic/api/ItemStackWrapper.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/api/ItemStackWrapper.java b/src/main/java/WayofTime/bloodmagic/api/ItemStackWrapper.java index b19b4eb2..2cdf5792 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ItemStackWrapper.java +++ b/src/main/java/WayofTime/bloodmagic/api/ItemStackWrapper.java @@ -8,6 +8,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; @@ -51,14 +52,15 @@ public class ItemStackWrapper this(blockStack.getBlock(), 1, blockStack.getMeta()); } + @Nullable public static ItemStackWrapper getHolder(ItemStack stack) { if (stack == null) - { return null; - } - return new ItemStackWrapper(stack.getItem(), stack.stackSize, stack.getItemDamage()); + ItemStackWrapper wrapper = new ItemStackWrapper(stack.getItem(), stack.stackSize, stack.getItemDamage()); + wrapper.setNbtTag(stack.getTagCompound()); + return wrapper; } public ItemStack toStack()