Merge branch 'BOP-1.8.9-3.0.x' of https://github.com/Glitchfiend/BiomesOPlenty into BOP-1.8.9-3.0.x

This commit is contained in:
Forstride 2016-02-19 05:24:39 -05:00
commit 5e043a4ee7

View file

@ -55,12 +55,14 @@ public class ItemEventHandler
{
InventoryFlowerBasket inventory = new InventoryFlowerBasket(basketStack, player);
//Add the stack to the basket's inventory
inventory.func_174894_a(stack);
//Set stack size to 0 to cause it to be removed
stack.stackSize = 0;
//Prevent the stack from being added to the player's inventory
event.setResult(Result.ALLOW);
//Add the stack to the basket's inventory, if successful, don't add it to the player's regular inventory
if (inventory.func_174894_a(stack) == null)
{
//Set stack size to 0 to cause it to be removed
stack.stackSize = 0;
//Prevent the stack from being added to the player's inventory
event.setResult(Result.ALLOW);
}
}
}
}