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

Fix double chest crash

Browse source
This commit is contained in:
Aidan Brady 2013-12-08 19:22:59 -05:00
parent d2753abc92
commit af1f32da8e
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
common/mekanism/common/util/InventoryUtils.java
View file

@ -50,6 +50,8 @@ public final class InventoryUtils
public static ItemStack putStackInInventory(IInventory inventory, ItemStack itemStack, int side, boolean force) public static ItemStack putStackInInventory(IInventory inventory, ItemStack itemStack, int side, boolean force)
{ {
inventory = checkChestInv(inventory);
if(force && inventory instanceof TileEntityLogisticalSorter) if(force && inventory instanceof TileEntityLogisticalSorter)
{ {
return ((TileEntityLogisticalSorter)inventory).sendHome(itemStack.copy()); return ((TileEntityLogisticalSorter)inventory).sendHome(itemStack.copy());
@ -59,8 +61,6 @@ public final class InventoryUtils
if(!(inventory instanceof ISidedInventory)) if(!(inventory instanceof ISidedInventory))
{ {
inventory = checkChestInv(inventory);
for(int i = 0; i <= inventory.getSizeInventory() - 1; i++) for(int i = 0; i <= inventory.getSizeInventory() - 1; i++)
{ {
if(!force) if(!force)
@ -167,6 +167,8 @@ public final class InventoryUtils
public static ItemStack takeTopItemFromInventory(IInventory inventory, int side) public static ItemStack takeTopItemFromInventory(IInventory inventory, int side)
{ {
inventory = checkChestInv(inventory);
if(!(inventory instanceof ISidedInventory)) if(!(inventory instanceof ISidedInventory))
{ {
for(int i = inventory.getSizeInventory() - 1; i >= 0; i--) for(int i = inventory.getSizeInventory() - 1; i >= 0; i--)
@ -213,12 +215,12 @@ public final class InventoryUtils
public static InvStack takeDefinedItem(IInventory inventory, int side, ItemStack type, int min, int max) public static InvStack takeDefinedItem(IInventory inventory, int side, ItemStack type, int min, int max)
{ {
inventory = checkChestInv(inventory);
InvStack ret = new InvStack(inventory); InvStack ret = new InvStack(inventory);
if(!(inventory instanceof ISidedInventory)) if(!(inventory instanceof ISidedInventory))
{ {
inventory = checkChestInv(inventory);
for(int i = inventory.getSizeInventory() - 1; i >= 0; i--) for(int i = inventory.getSizeInventory() - 1; i >= 0; i--)
{ {
if(inventory.getStackInSlot(i) != null && inventory.getStackInSlot(i).isItemEqual(type)) if(inventory.getStackInSlot(i) != null && inventory.getStackInSlot(i).isItemEqual(type))
@ -295,11 +297,11 @@ public final class InventoryUtils
} }
public static InvStack takeTopStack(IInventory inventory, int side) public static InvStack takeTopStack(IInventory inventory, int side)
{
if(!(inventory instanceof ISidedInventory))
{ {
inventory = checkChestInv(inventory); inventory = checkChestInv(inventory);
if(!(inventory instanceof ISidedInventory))
{
for(int i = inventory.getSizeInventory() - 1; i >= 0; i--) for(int i = inventory.getSizeInventory() - 1; i >= 0; i--)
{ {
if(inventory.getStackInSlot(i) != null) if(inventory.getStackInSlot(i) != null)
@ -359,12 +361,10 @@ public final class InventoryUtils
} }
} }
IInventory inventory = (IInventory)tileEntity; IInventory inventory = checkChestInv((IInventory)tileEntity);
if(!(inventory instanceof ISidedInventory)) if(!(inventory instanceof ISidedInventory))
{ {
inventory = InventoryUtils.checkChestInv(inventory);
for(int i = 0; i <= inventory.getSizeInventory() - 1; i++) for(int i = 0; i <= inventory.getSizeInventory() - 1; i++)
{ {
if(!force) if(!force)