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

Fill existing stacks first when adding to player inventory. (#3025)

Browse Source
This commit is contained in:
fscan
2017-08-14 11:03:53 +02:00
committed by yueh
parent 65c6d2249a
commit 9022150e38
3 changed files with 83 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/util/inv/AdaptorItemHandler.java
+6 -11
View File
@@ -31,7 +31,7 @@ import appeng.util.Platform;
public class AdaptorItemHandler extends InventoryAdaptor
{
private final IItemHandler itemHandler;
protected final IItemHandler itemHandler;
public AdaptorItemHandler( IItemHandler itemHandler )
{
@@ -223,9 +223,9 @@ public class AdaptorItemHandler extends InventoryAdaptor
return this.addItems( toBeSimulated, true );
}
private ItemStack addItems( final ItemStack itemsToAdd, final boolean simulate )
protected ItemStack addItems( final ItemStack itemsToAdd, final boolean simulate )
{
if( itemsToAdd.isEmpty() || itemsToAdd.getCount() == 0 )
if( itemsToAdd.isEmpty() )
{
return ItemStack.EMPTY;
}
@@ -234,16 +234,11 @@ public class AdaptorItemHandler extends InventoryAdaptor
for( int slot = 0; slot < this.itemHandler.getSlots(); slot++ )
{
ItemStack is = this.itemHandler.getStackInSlot( slot );
left = this.itemHandler.insertItem( slot, left, simulate );
if( is.isEmpty() || Platform.itemComparisons().isSameItem( is, left ) )
if( left.isEmpty() )
{
left = this.itemHandler.insertItem( slot, left, simulate );
if( left.isEmpty() || left.getCount() <= 0 )
{
return ItemStack.EMPTY;
}
return ItemStack.EMPTY;
}
}