From 5d67710dbc1f6712b5ce423ffa9779b5a205dd86 Mon Sep 17 00:00:00 2001
From: HenryLoenwind <henry@loenwind.info>
Date: Mon, 14 Sep 2015 00:45:12 +0200
Subject: [PATCH] Fix: NPE on kamikaze fluid container

---
 src/main/java/com/enderio/core/common/util/FluidUtil.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/com/enderio/core/common/util/FluidUtil.java b/src/main/java/com/enderio/core/common/util/FluidUtil.java
index da47a20..b7d5bae 100644
--- a/src/main/java/com/enderio/core/common/util/FluidUtil.java
+++ b/src/main/java/com/enderio/core/common/util/FluidUtil.java
@@ -386,6 +386,10 @@ public class FluidUtil {
         entityPlayer.inventory.setInventorySlotContents(entityPlayer.inventory.currentItem, fill.remainder.itemStack);
       }
 
+      if (fill.result.itemStack == null) {
+        return true;
+      }
+      
       if (fill.result.itemStack.isStackable()) {
         for (int i = 0; i < entityPlayer.inventory.mainInventory.length; i++) {
           ItemStack inventoryItem = entityPlayer.inventory.mainInventory[i];