Fix buckets disappearing when they can't completely fill flopper

Closes #23
CyclopsMC · Oct 4, 2021 · f71b7b1 · f71b7b1
1 parent cae7d19
commit f71b7b1
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/main/java/org/cyclops/flopper/block/BlockFlopper.java b/src/main/java/org/cyclops/flopper/block/BlockFlopper.java
@@ -206,9 +206,12 @@ public ActionResultType onBlockActivated(BlockState blockState, World world, Blo
                         if (!player.isCrouching()
                                 && tryEmptyContainer(itemStack, fluidHandler, FluidHelpers.BUCKET_VOLUME, player, false).isSuccess()) {
                             // Move fluid from the item into the tank if not sneaking
-                            ItemStack drainedItem = FluidUtil.tryEmptyContainer(itemStack, fluidHandler, FluidHelpers.BUCKET_VOLUME, player, true).getResult();
-                            if (!player.isCreative()) {
-                                InventoryHelpers.tryReAddToStack(player, itemStack, drainedItem);
+                            FluidActionResult result = FluidUtil.tryEmptyContainer(itemStack, fluidHandler, FluidHelpers.BUCKET_VOLUME, player, true);
+                            if (result.isSuccess()) {
+                                ItemStack drainedItem = result.getResult();
+                                if (!player.isCreative()) {
+                                    InventoryHelpers.tryReAddToStack(player, itemStack, drainedItem);
+                                }
                             }
                             return ActionResultType.SUCCESS;
                         } else if (player.isCrouching()