From f9bf63ccf1b583bf8aac5257b9d18b97518411b0 Mon Sep 17 00:00:00 2001
From: WayofTime <wtime@live.ca>
Date: Sun, 3 Apr 2016 10:12:10 -0400
Subject: [PATCH] Fixed NPE when using an empty bucket

---
 changelog.txt                                  |  5 +++++
 .../block/BlockDimensionalPortal.java          | 18 ++++++++++++++++++
 .../bloodmagic/util/handler/EventHandler.java  |  5 +++++
 3 files changed, 28 insertions(+)

diff --git a/changelog.txt b/changelog.txt
index c2584a71..56ac7433 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,8 @@
+------------------------------------------------------
+Version 2.0.0-31
+------------------------------------------------------
+- Fixed NPE when using an empty bucket.
+
 ------------------------------------------------------
 Version 2.0.0-30
 ------------------------------------------------------
diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java b/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java
index 22d76d09..f4d87b0b 100644
--- a/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java
+++ b/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java
@@ -46,6 +46,24 @@ public class BlockDimensionalPortal extends BlockIntegerContainer
         return new TileDimensionalPortal();
     }
 
+    @Override
+    public boolean isNormalCube(IBlockState state, IBlockAccess world, BlockPos pos)
+    {
+        return false;
+    }
+
+    @Override
+    public boolean isOpaqueCube(IBlockState state)
+    {
+        return false;
+    }
+
+    @Override
+    public boolean isVisuallyOpaque()
+    {
+        return false;
+    }
+
     @Override
     public AxisAlignedBB getCollisionBoundingBox(IBlockState state, World world, BlockPos pos)
     {
diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java
index 14b0f743..887aae9e 100644
--- a/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java
+++ b/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java
@@ -391,6 +391,11 @@ public class EventHandler
 
         ItemStack result = null;
 
+        if (event.getTarget() == null || event.getTarget().getBlockPos() == null)
+        {
+            return;
+        }
+
         Block block = event.getWorld().getBlockState(event.getTarget().getBlockPos()).getBlock();
 
         if (block != null && (block.equals(ModBlocks.lifeEssence)) && block.getMetaFromState(event.getWorld().getBlockState(event.getTarget().getBlockPos())) == 0)