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

Restrict ItemHandlerAdaptor to not exceed the stacksize of a slot. (#2595)

Browse Source
This commit is contained in:
yueh
2016-11-13 11:33:31 +01:00
parent 26e86a114c
commit c74166b02a
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/parts/misc/ItemHandlerAdapter.java
+9 -6
View File
@@ -117,21 +117,22 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
} }
ItemStack extracted; ItemStack extracted;
int remainingCurrentSlot = Math.min( remainingSize, stackInInventorySlot.stackSize );
// We have to loop here because according to the docs, the handler shouldn't return a stack with size > // We have to loop here because according to the docs, the handler shouldn't return a stack with size >
// maxSize, even if we request more. So even if it returns a valid stack, it might have more stuff. // maxSize, even if we request more. So even if it returns a valid stack, it might have more stuff.
do do
{ {
extracted = itemHandler.extractItem( i, remainingSize, simulate ); extracted = itemHandler.extractItem( i, remainingCurrentSlot, simulate );
if( extracted != null ) if( extracted != null )
{ {
if( extracted.stackSize > remainingSize ) if( extracted.stackSize > remainingCurrentSlot )
{ {
// Something broke. It should never return more than we requested... // Something broke. It should never return more than we requested...
// We're going to silently eat the remainder // We're going to silently eat the remainder
AELog.warn( "Mod that provided item handler %1 is broken. Returned %2 items, even though we requested %3.", AELog.warn( "Mod that provided item handler %1 is broken. Returned %2 items, even though we requested %3.",
itemHandler.getClass().getSimpleName(), extracted.stackSize, remainingSize ); itemHandler.getClass().getSimpleName(), extracted.stackSize, remainingCurrentSlot );
extracted.stackSize = remainingSize; extracted.stackSize = remainingCurrentSlot;
} }
// We're just gonna use the first stack we get our hands on as the template for the rest // We're just gonna use the first stack we get our hands on as the template for the rest
@@ -143,10 +144,12 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
{ {
gathered.stackSize += extracted.stackSize; gathered.stackSize += extracted.stackSize;
} }
remainingSize -= extracted.stackSize; remainingCurrentSlot -= extracted.stackSize;
} }
} }
while( extracted != null && remainingSize > 0 ); while( extracted != null && remainingCurrentSlot > 0 );
remainingSize -= remainingCurrentSlot;
// Done? // Done?
if( remainingSize <= 0 ) if( remainingSize <= 0 )