From 5b3e1e8c38b95b6d26e2ca6bc320ec15f2fc8490 Mon Sep 17 00:00:00 2001
From: simibubi <31564874+simibubi@users.noreply.github.com>
Date: Sat, 19 Dec 2020 00:52:41 +0100
Subject: [PATCH] Prime patching material

- Fixed open pipe ends not providing fluids to pipe networks
- Safety check for pipe attachment rendering
---
 .../create/content/contraptions/fluids/FluidNetwork.java    | 6 ++++++
 .../contraptions/fluids/pipes/StraightPipeTileEntity.java   | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/FluidNetwork.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/FluidNetwork.java
index a0e0ac8cc..364b7cf29 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/FluidNetwork.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/FluidNetwork.java
@@ -191,6 +191,12 @@ public class FluidNetwork {
 				transfer = handler.drain(toExtract, action);
 			}
 			
+			if (transfer.isEmpty()) {
+				FluidStack genericExtract = handler.drain(flowSpeed, action);
+				if (!genericExtract.isEmpty() && genericExtract.isFluidEqual(fluid))
+					transfer = genericExtract;
+			}
+				
 			if (transfer.isEmpty())
 				return;
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/StraightPipeTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/StraightPipeTileEntity.java
index c905dcfe9..d3ee7764e 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/StraightPipeTileEntity.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/StraightPipeTileEntity.java
@@ -32,10 +32,10 @@ public class StraightPipeTileEntity extends SmartTileEntity {
 		public StraightPipeFluidTransportBehaviour(SmartTileEntity te) {
 			super(te);
 		}
-		
+
 		@Override
 		public boolean canHaveFlowToward(BlockState state, Direction direction) {
-			return state.get(AxisPipeBlock.AXIS) == direction.getAxis();
+			return state.has(AxisPipeBlock.AXIS) && state.get(AxisPipeBlock.AXIS) == direction.getAxis();
 		}
 
 		@Override