From 38e54a4e2f6621df459c19d4d28e72f086fd8ef2 Mon Sep 17 00:00:00 2001
From: Nicholas Ignoffo <speedynutty68@gmail.com>
Date: Tue, 23 May 2017 18:41:24 -0700
Subject: [PATCH] Fixed NPE in Fluid Filter (#1139)

(cherry picked from commit 9a7db20)
---
 .../WayofTime/bloodmagic/routing/RoutingFluidFilter.java    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/java/WayofTime/bloodmagic/routing/RoutingFluidFilter.java b/src/main/java/WayofTime/bloodmagic/routing/RoutingFluidFilter.java
index 2b5f7812..b5132798 100644
--- a/src/main/java/WayofTime/bloodmagic/routing/RoutingFluidFilter.java
+++ b/src/main/java/WayofTime/bloodmagic/routing/RoutingFluidFilter.java
@@ -13,6 +13,8 @@ import net.minecraftforge.fluids.FluidUtil;
 import net.minecraftforge.fluids.capability.IFluidHandler;
 import net.minecraftforge.fluids.capability.IFluidTankProperties;
 
+import javax.annotation.Nullable;
+
 public class RoutingFluidFilter implements IFluidFilter
 {
     protected List<FluidStack> requestList;
@@ -85,9 +87,13 @@ public class RoutingFluidFilter implements IFluidFilter
         }
     }
 
+    @Nullable
     public static FluidStack getFluidStackFromItemStack(ItemStack inputStack)
     {
         FluidStack fluidStack = FluidUtil.getFluidContained(inputStack);
+        if (fluidStack == null)
+            return null;
+
         fluidStack.amount = inputStack.getCount();
         return fluidStack;
     }