tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix ItemProxy leak

Browse source
This commit is contained in:
Aidan Brady 2013-11-17 23:37:02 -05:00
parent cc5d4281a2
commit 52d42e99f2
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
common/mekanism/common/item/ItemBlockBasic.java
View file

@ -115,11 +115,12 @@ public class ItemBlockBasic extends ItemBlock
{
if(stack.getItemDamage() != 6 || stack.stackTagCompound == null || !stack.stackTagCompound.hasKey("newCount"))
{
return new ItemStack(Mekanism.ItemProxy);
return ItemProxy.getDead();
}
ItemStack ret = stack.copy();
ret.stackTagCompound.setInteger("itemCount", stack.stackTagCompound.getInteger("newCount"));
return ret;
}

12
common/mekanism/common/item/ItemProxy.java
View file

@ -11,12 +11,13 @@ public class ItemProxy extends Item
public ItemProxy(int id)
{
super(id);
setMaxDamage(1);
}
@Override
public ItemStack getContainerItemStack(ItemStack stack)
{
return getSavedItem(stack) != null ? getSavedItem(stack) : new ItemStack(Mekanism.ItemProxy);
return getSavedItem(stack) != null ? getSavedItem(stack) : getDead();
}
@Override
@ -64,6 +65,15 @@ public class ItemProxy extends Item
return null;
}
public static ItemStack getDead()
{
ItemStack stack = new ItemStack(Mekanism.ItemProxy);
stack.stackSize = 0;
stack.setItemDamage(2);
return stack;
}
@Override
public void registerIcons(IconRegister register) {}
}