From 59d1d3456b60d21b5319e0baf9defdcbd099ec7d Mon Sep 17 00:00:00 2001 From: mezz Date: Tue, 13 Oct 2015 08:08:53 -0700 Subject: [PATCH] Fix #888 Squeezer should not work with reusable fluid containers --- src/main/java/forestry/factory/tiles/TileSqueezer.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/main/java/forestry/factory/tiles/TileSqueezer.java b/src/main/java/forestry/factory/tiles/TileSqueezer.java index a9abf7314..d03a45cf6 100644 --- a/src/main/java/forestry/factory/tiles/TileSqueezer.java +++ b/src/main/java/forestry/factory/tiles/TileSqueezer.java @@ -404,19 +404,14 @@ public class TileSqueezer extends TilePowered implements ISocketable, ISidedInve containerRecipes.put(emptyContainer, new SqueezerContainerRecipe(emptyContainer, timePerItem, remnants, chance)); } + @Nullable public static ISqueezerContainerRecipe findMatchingContainerRecipe(ItemStack filledContainer) { ItemStack emptyContainer = FluidHelper.getEmptyContainer(filledContainer); if (emptyContainer == null) { return null; } - ISqueezerContainerRecipe containerRecipe = containerRecipes.get(emptyContainer); - if (containerRecipe != null) { - return containerRecipe; - } - - // default recipe for unregistered fluid items, has no remnants - return new SqueezerContainerRecipe(emptyContainer, 10, null, 0); + return containerRecipes.get(emptyContainer); } public static ISqueezerRecipe findMatchingRecipe(ItemStack[] items) {