keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Vanilla hopper should obey the IInventory contract, TileEntityHopper now takes into account IInventory.getInventoryStackLimit() when inserting items Closes #597.

Browse source
This commit is contained in:
Lex Manos 2013-09-30 11:37:37 -07:00
parent ca351b527d
commit 50b9abc13f
1 changed files with 38 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
patches/minecraft/net/minecraft/tileentity/TileEntityHopper.java.patch Normal file
View file

@ -0,0 +1,38 @@
--- ../src_base/minecraft/net/minecraft/tileentity/TileEntityHopper.java
+++ ../src_work/minecraft/net/minecraft/tileentity/TileEntityHopper.java
@@ -453,17 +453,28 @@
if (itemstack1 == null)
{
- par0IInventory.setInventorySlotContents(par2, par1ItemStack);
- par1ItemStack = null;
+ int max = Math.min(par1ItemStack.getMaxStackSize(), par0IInventory.getInventoryStackLimit());
+ if (max >= par1ItemStack.stackSize)
+ {
+ par0IInventory.setInventorySlotContents(par2, par1ItemStack);
+ par1ItemStack = null;
+ }
+ else
+ {
+ par0IInventory.setInventorySlotContents(par2, par1ItemStack.splitStack(max));
+ }
flag = true;
}
else if (areItemStacksEqualItem(itemstack1, par1ItemStack))
{
- int k = par1ItemStack.getMaxStackSize() - itemstack1.stackSize;
- int l = Math.min(par1ItemStack.stackSize, k);
- par1ItemStack.stackSize -= l;
- itemstack1.stackSize += l;
- flag = l > 0;
+ int max = Math.min(par1ItemStack.getMaxStackSize(), par0IInventory.getInventoryStackLimit());
+ if (max > itemstack1.stackSize)
+ {
+ int l = Math.min(par1ItemStack.stackSize, max - itemstack1.stackSize);
+ par1ItemStack.stackSize -= l;
+ itemstack1.stackSize += l;
+ flag = l > 0;
+ }
}
if (flag)