Anvilcraft/buildcraft
2
1
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #3122 from iTitus/fix-3120

Browse source 
Fix #3120
This commit is contained in:
Adrian Siekierka 2015-11-08 12:38:29 +01:00
parent ebbdbdaef7 077f38ea13
commit 294def3cee
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
common/buildcraft/core/statements/TriggerInventoryLevel.java
View file

@ -70,6 +70,7 @@ public class TriggerInventoryLevel extends BCStatement implements ITriggerExtern
}
if (tile instanceof IInventory) {
IInventory inventory = (IInventory) tile;
ItemStack searchStack = parameters[0].getItemStack();
if (searchStack == null) {
@ -78,7 +79,7 @@ public class TriggerInventoryLevel extends BCStatement implements ITriggerExtern
int stackSpace = 0;
int foundItems = 0;
for (IInvSlot slot : InventoryIterator.getIterable((IInventory) tile, side.getOpposite())) {
for (IInvSlot slot : InventoryIterator.getIterable(inventory, side.getOpposite())) {
if (slot.canPutStackInSlot(searchStack)) {
ItemStack stackInSlot = slot.getStackInSlot();
if (stackInSlot == null || StackHelper.canStacksOrListsMerge(stackInSlot, searchStack)) {
@ -89,7 +90,7 @@ public class TriggerInventoryLevel extends BCStatement implements ITriggerExtern
}
if (stackSpace > 0) {
float percentage = foundItems / ((float) stackSpace * (float) searchStack.getMaxStackSize());
float percentage = foundItems / ((float) stackSpace * (float) Math.min(searchStack.getMaxStackSize(), inventory.getInventoryStackLimit()));
return percentage < type.level;
}