diff --git a/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedItemBuildPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedItemBuildPacket.java index 3b910e0ce..d4ac8bb44 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedItemBuildPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedItemBuildPacket.java @@ -70,10 +70,10 @@ public final class LinkedItemBuildPacket extends AbstractPacket { LinkedItem copy = original.clone(); EntityPlayerMP playerMP = (EntityPlayerMP) player; - ItemStack stack = new ItemStack(CustomItems.linked_item, 1); - ScriptLinkedItem scriptLinkedItem = new ScriptLinkedItem(stack, copy); + ScriptLinkedItem scriptLinkedItem = (ScriptLinkedItem) NpcAPI.Instance().createItem("customnpcs:linked_item", 0, 1); + scriptLinkedItem.setDefaults(); scriptLinkedItem.linkedVersion = copy.version; scriptLinkedItem.saveItemData(); - playerMP.inventory.addItemStackToInventory(stack); + playerMP.inventory.addItemStackToInventory(scriptLinkedItem.item); } } diff --git a/src/main/java/noppes/npcs/scripted/item/ScriptLinkedItem.java b/src/main/java/noppes/npcs/scripted/item/ScriptLinkedItem.java index a1c6a68bf..3e0b19ab4 100644 --- a/src/main/java/noppes/npcs/scripted/item/ScriptLinkedItem.java +++ b/src/main/java/noppes/npcs/scripted/item/ScriptLinkedItem.java @@ -8,7 +8,7 @@ import noppes.npcs.controllers.data.INpcScriptHandler; import noppes.npcs.controllers.data.LinkedItem; public class ScriptLinkedItem extends ScriptCustomizableItem implements IItemLinked { - public LinkedItem linkedItem; + public LinkedItem linkedItem = new LinkedItem(); public double durabilityValue = 1.0D; public int linkedVersion = 1; public ScriptLinkedItem(ItemStack item) { @@ -16,13 +16,6 @@ public class ScriptLinkedItem extends ScriptCustomizableItem implements IItemLin loadItemData(); } - // For Building - public ScriptLinkedItem(ItemStack item, LinkedItem original) { - super(item); - setDefaults(); - this.linkedItem = original.clone(); - } - public void setDefaults(){ this.itemDisplay.texture = null; this.itemDisplay.translateX = null; @@ -201,8 +194,6 @@ public class ScriptLinkedItem extends ScriptCustomizableItem implements IItemLin public void setItemNBT(NBTTagCompound compound) { this.itemDisplay.readFromNBT(compound); - if(linkedItem == null) - this.linkedItem = new LinkedItem(); this.linkedItem.readFromNBT(compound, false); this.linkedVersion = compound.getInteger(LinkedItem.LINKED_VERSION_VERSION_TAG); }