From 939b276c5636bfbaa21346f5f2ff7060129d310c Mon Sep 17 00:00:00 2001
From: simibubi <31564874+simibubi@users.noreply.github.com>
Date: Sat, 12 Mar 2022 22:27:33 +0100
Subject: [PATCH] Patch the Patch

- Bugfixes to recently added/changed functionality
---
 .../create/compat/jei/category/ItemDrainCategory.java     | 8 ++++----
 .../create/compat/jei/category/SpoutCategory.java         | 4 ++--
 .../create/content/contraptions/fluids/OpenEndedPipe.java | 7 +++----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/simibubi/create/compat/jei/category/ItemDrainCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/ItemDrainCategory.java
index 3309363d5..5d2d87a85 100644
--- a/src/main/java/com/simibubi/create/compat/jei/category/ItemDrainCategory.java
+++ b/src/main/java/com/simibubi/create/compat/jei/category/ItemDrainCategory.java
@@ -51,13 +51,13 @@ public class ItemDrainCategory extends CreateRecipeCategory<EmptyingRecipe> {
 					.withFluidOutputs(fluidFromPotionItem)
 					.withSingleItemOutput(new ItemStack(Items.GLASS_BOTTLE))
 					.build());
-				return;
+				continue;
 			}
 
 			LazyOptional<IFluidHandlerItem> capability =
 				stack.getCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY);
 			if (!capability.isPresent())
-				return;
+				continue;
 
 			ItemStack copy = stack.copy();
 			capability = copy.getCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY);
@@ -65,9 +65,9 @@ public class ItemDrainCategory extends CreateRecipeCategory<EmptyingRecipe> {
 			FluidStack extracted = handler.drain(1000, FluidAction.EXECUTE);
 			ItemStack result = handler.getContainer();
 			if (extracted.isEmpty())
-				return;
+				continue;
 			if (result.isEmpty())
-				return;
+				continue;
 
 			Ingredient ingredient = Ingredient.of(stack);
 			ResourceLocation itemName = stack.getItem()
diff --git a/src/main/java/com/simibubi/create/compat/jei/category/SpoutCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/SpoutCategory.java
index 463b34183..acf6d2463 100644
--- a/src/main/java/com/simibubi/create/compat/jei/category/SpoutCategory.java
+++ b/src/main/java/com/simibubi/create/compat/jei/category/SpoutCategory.java
@@ -56,13 +56,13 @@ public class SpoutCategory extends CreateRecipeCategory<FillingRecipe> {
 					.withFluidIngredients(FluidIngredient.fromFluidStack(fluidFromPotionItem))
 					.withSingleItemOutput(stack)
 					.build());
-				return;
+				continue;
 			}
 
 			LazyOptional<IFluidHandlerItem> capability =
 				stack.getCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY);
 			if (!capability.isPresent())
-				return;
+				continue;
 
 			for (FluidStack fluidStack : fluidStacks) {
 				ItemStack copy = stack.copy();
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/OpenEndedPipe.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/OpenEndedPipe.java
index 25921554b..b14ef480c 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/OpenEndedPipe.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/OpenEndedPipe.java
@@ -179,11 +179,8 @@ public class OpenEndedPipe extends FlowSource {
 			return false;
 		if (fluid.isEmpty())
 			return false;
-		if (!FluidHelper.hasBlockState(fluid.getFluid())) {
-			if (!simulate)
-				applyEffects(fluid);
+		if (!FluidHelper.hasBlockState(fluid.getFluid())) 
 			return true;
-		}
 
 		if (!fluidState.isEmpty() && fluidState.getType() != fluid.getFluid()) {
 			FluidReactions.handlePipeSpillCollision(world, outputPos, fluid.getFluid(), fluidState);
@@ -272,6 +269,8 @@ public class OpenEndedPipe extends FlowSource {
 			int fill = super.fill(resource, action);
 			if (action.simulate())
 				return fill;
+			if (!resource.isEmpty())
+				applyEffects(resource);
 			if (getFluidAmount() == 1000 || !FluidHelper.hasBlockState(containedFluidStack.getFluid()))
 				if (provideFluidToSpace(containedFluidStack, false))
 					setFluid(FluidStack.EMPTY);