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

src/main/java/biomesoplenty/common/handler/ItemEventHandler.java

@@ -55,8 +55,9 @@ public class ItemEventHandler
             {
                 InventoryFlowerBasket inventory = new InventoryFlowerBasket(basketStack, player);
 
-                //Add the stack to the basket's inventory
-                inventory.func_174894_a(stack);
+                //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
@@ -65,3 +66,4 @@ public class ItemEventHandler
             }
         }
     }
+}