From 08031e65f822e877427e7e7084a29b94011391de Mon Sep 17 00:00:00 2001
From: WayofTime <wtime@live.ca>
Date: Fri, 2 Mar 2018 15:21:51 -0500
Subject: [PATCH] Fixed client-sided crash in the Blood Light sigil by
 rearranging a few arguments.

---
 changelog.txt                                 |  6 +++
 .../item/sigil/ItemSigilBloodLight.java       | 41 +++++++++++++------
 2 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index 3a1b7fea..5a76db06 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,9 @@
+------------------------------------------------------
+Version 2.2.8
+------------------------------------------------------
+- Fixed a client side null-pointer exception with the Blood Lamp
+	- It's a bright idea to fix this as soon as I can.
+
 ------------------------------------------------------
 Version 2.2.7
 ------------------------------------------------------
diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java
index 5fb9b806..42b5f026 100644
--- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java
+++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java
@@ -18,19 +18,23 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.world.World;
 
-public class ItemSigilBloodLight extends ItemSigilBase {
-    public ItemSigilBloodLight() {
+public class ItemSigilBloodLight extends ItemSigilBase
+{
+    public ItemSigilBloodLight()
+    {
         super("blood_light", 10);
     }
 
     @Override
-    public void onUpdate(ItemStack stack, World worldIn, Entity entityIn, int itemSlot, boolean isSelected) {
+    public void onUpdate(ItemStack stack, World worldIn, Entity entityIn, int itemSlot, boolean isSelected)
+    {
         if (getCooldownRemainder(stack) > 0)
             reduceCooldown(stack);
     }
 
     @Override
-    public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player, EnumHand hand) {
+    public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player, EnumHand hand)
+    {
         ItemStack stack = player.getHeldItem(hand);
         if (stack.getItem() instanceof ISigil.Holding)
             stack = ((Holding) stack.getItem()).getHeldItem(stack, player);
@@ -42,20 +46,27 @@ public class ItemSigilBloodLight extends ItemSigilBase {
         if (getCooldownRemainder(stack) > 0)
             return super.onItemRightClick(world, player, hand);
 
-        SoulNetwork network = NetworkHelper.getSoulNetwork(getBinding(stack));
-        if (mop != null && mop.typeOfHit == RayTraceResult.Type.BLOCK) {
+        if (mop != null && mop.typeOfHit == RayTraceResult.Type.BLOCK)
+        {
             BlockPos blockPos = mop.getBlockPos().offset(mop.sideHit);
 
-            if (world.isAirBlock(blockPos)) {
+            if (world.isAirBlock(blockPos))
+            {
                 world.setBlockState(blockPos, RegistrarBloodMagicBlocks.BLOOD_LIGHT.getDefaultState());
                 if (!world.isRemote)
+                {
+                    SoulNetwork network = NetworkHelper.getSoulNetwork(getBinding(stack));
                     network.syphonAndDamage(player, getLpUsed());
+                }
                 resetCooldown(stack);
                 player.swingArm(hand);
                 return super.onItemRightClick(world, player, hand);
             }
-        } else {
-            if (!world.isRemote) {
+        } else
+        {
+            if (!world.isRemote)
+            {
+                SoulNetwork network = NetworkHelper.getSoulNetwork(getBinding(stack));
                 world.spawnEntity(new EntityBloodLight(world, player));
                 network.syphonAndDamage(player, getLpUsed());
             }
@@ -66,19 +77,23 @@ public class ItemSigilBloodLight extends ItemSigilBase {
     }
 
     @Override
-    public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) {
+    public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged)
+    {
         return oldStack.getItem() != newStack.getItem();
     }
 
-    public int getCooldownRemainder(ItemStack stack) {
+    public int getCooldownRemainder(ItemStack stack)
+    {
         return NBTHelper.checkNBT(stack).getTagCompound().getInteger(Constants.NBT.TICKS_REMAINING);
     }
 
-    public void reduceCooldown(ItemStack stack) {
+    public void reduceCooldown(ItemStack stack)
+    {
         NBTHelper.checkNBT(stack).getTagCompound().setInteger(Constants.NBT.TICKS_REMAINING, getCooldownRemainder(stack) - 1);
     }
 
-    public void resetCooldown(ItemStack stack) {
+    public void resetCooldown(ItemStack stack)
+    {
         NBTHelper.checkNBT(stack).getTagCompound().setInteger(Constants.NBT.TICKS_REMAINING, 10);
     }
 }