fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed a null check when the array wasn't initialised yet. I should fix this up in the future though.

Browse Source
This commit is contained in:
Gunther De Wachter
2017-06-26 05:43:08 +02:00
parent 5432decf95
commit df7ab00c37
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/tile/inventory/AppEngInternalInventory.java
+9 -2
View File
@@ -113,10 +113,17 @@ public class AppEngInternalInventory implements IInventory, Iterable<ItemStack>
return ItemStack.EMPTY; return ItemStack.EMPTY;
} }
private ItemStack getOldStack( int slot ) {
if( this.inv[slot] == null )
return ItemStack.EMPTY;
else return this.inv[slot];
}
@Override @Override
public void setInventorySlotContents( final int slot, final ItemStack newItemStack ) public void setInventorySlotContents( final int slot, final ItemStack newItemStack )
{ {
final ItemStack oldStack = this.inv[slot]; final ItemStack oldStack = getOldStack(slot);
this.inv[slot] = newItemStack; this.inv[slot] = newItemStack;
if( this.getTileEntity() != null && this.eventsEnabled() ) if( this.getTileEntity() != null && this.eventsEnabled() )
@@ -130,7 +137,7 @@ public class AppEngInternalInventory implements IInventory, Iterable<ItemStack>
{ {
removed = removed.copy(); removed = removed.copy();
removed.grow( -newItemStack.getCount() ); removed.grow( -newItemStack.getCount() );
added = null; added = ItemStack.EMPTY;
} }
else if( oldStack.getCount() < newItemStack.getCount() ) else if( oldStack.getCount() < newItemStack.getCount() )
{ {