From 85a16ac075e68ffb0486ff50652f69f3c2a35151 Mon Sep 17 00:00:00 2001
From: Nicholas Ignoffo <speedynutty68@gmail.com>
Date: Mon, 6 Mar 2017 16:18:55 -0800
Subject: [PATCH] Should fix Blood Light being collidable (#1083)

Why did this only occur in obfuscated environments?
---
 .../WayofTime/bloodmagic/block/BlockBloodLight.java | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java b/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java
index 4b9fe9b1..e6fcedeb 100644
--- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java
+++ b/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java
@@ -1,6 +1,5 @@
 package WayofTime.bloodmagic.block;
 
-import java.util.List;
 import java.util.Random;
 
 import net.minecraft.block.Block;
@@ -9,7 +8,6 @@ import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.client.particle.ParticleManager;
-import net.minecraft.entity.Entity;
 import net.minecraft.util.BlockRenderLayer;
 import net.minecraft.util.EnumParticleTypes;
 import net.minecraft.util.math.AxisAlignedBB;
@@ -21,6 +19,8 @@ import net.minecraftforge.fml.relauncher.SideOnly;
 import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.registry.ModItems;
 
+import javax.annotation.Nullable;
+
 public class BlockBloodLight extends Block
 {
     protected static final AxisAlignedBB AABB = new AxisAlignedBB(0.4, 0.4, 0.4, 0.6, 0.6, 0.6);
@@ -32,10 +32,17 @@ public class BlockBloodLight extends Block
         setUnlocalizedName(Constants.Mod.MODID + ".bloodLight");
     }
 
+    @Nullable
     @Override
-    public void addCollisionBoxToList(IBlockState state, World worldIn, BlockPos pos, AxisAlignedBB mask, List<AxisAlignedBB> list, Entity collidingEntity)
+    public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, IBlockAccess worldIn, BlockPos pos)
     {
+        return null;
+    }
 
+    @Override
+    public boolean isCollidable()
+    {
+        return false;
     }
 
     @Override