From 06df5f5e39c0bc099730519d5c0abfc924192504 Mon Sep 17 00:00:00 2001
From: Arcaratus <byou64@gmail.com>
Date: Mon, 20 Jul 2015 19:56:29 -0400
Subject: [PATCH] Fix Entities

---
 .../common/entity/mob/EntityBileDemon.java                | 4 ++--
 .../common/entity/mob/EntityBoulderFist.java              | 4 ++--
 .../common/entity/mob/EntityFallenAngel.java              | 8 ++++----
 .../common/entity/mob/EntityIceDemon.java                 | 4 ++--
 .../common/entity/mob/EntityLowerGuardian.java            | 4 ++--
 .../alchemicalWizardry/common/entity/mob/EntityShade.java | 4 ++--
 .../common/entity/mob/EntitySmallEarthGolem.java          | 4 ++--
 .../common/entity/mob/EntityWingedFireDemon.java          | 4 ++--
 8 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityBileDemon.java b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityBileDemon.java
index 1d9203da..3d21cda8 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityBileDemon.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityBileDemon.java
@@ -359,10 +359,10 @@ public class EntityBileDemon extends EntityDemon
 
         if (par1)
         {
-            this.dataWatcher.updateObject(16, b0 | 2);
+            this.dataWatcher.updateObject(16, Byte.valueOf((byte)(b0 | 2)));
         } else
         {
-            this.dataWatcher.updateObject(16, b0 & -3);
+            this.dataWatcher.updateObject(16, Byte.valueOf((byte)(b0 & -3)));
         }
     }
 
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityBoulderFist.java b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityBoulderFist.java
index 4bbabd72..2dad0271 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityBoulderFist.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityBoulderFist.java
@@ -352,10 +352,10 @@ public class EntityBoulderFist extends EntityDemon
 
         if (par1)
         {
-            this.dataWatcher.updateObject(16, b0 | 2);
+            this.dataWatcher.updateObject(16, Byte.valueOf((byte)(b0 | 2)));
         } else
         {
-            this.dataWatcher.updateObject(16, b0 & -3);
+            this.dataWatcher.updateObject(16, Byte.valueOf((byte)(b0 & -3)));
         }
     }
 
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityFallenAngel.java b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityFallenAngel.java
index 5f841983..3187dccf 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityFallenAngel.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityFallenAngel.java
@@ -267,7 +267,7 @@ public class EntityFallenAngel extends EntityDemon implements IRangedAttackMob
 
                         if (itemstack.stackSize <= 0)
                         {
-                            par1EntityPlayer.inventory.setInventorySlotContents(par1EntityPlayer.inventory.currentItem, (ItemStack) null);
+                            par1EntityPlayer.inventory.setInventorySlotContents(par1EntityPlayer.inventory.currentItem, null);
                         }
 
                         return true;
@@ -297,7 +297,7 @@ public class EntityFallenAngel extends EntityDemon implements IRangedAttackMob
 
             if (itemstack.stackSize <= 0)
             {
-                par1EntityPlayer.inventory.setInventorySlotContents(par1EntityPlayer.inventory.currentItem, (ItemStack) null);
+                par1EntityPlayer.inventory.setInventorySlotContents(par1EntityPlayer.inventory.currentItem, null);
             }
 
             if (!this.worldObj.isRemote)
@@ -353,10 +353,10 @@ public class EntityFallenAngel extends EntityDemon implements IRangedAttackMob
 
         if (par1)
         {
-            this.dataWatcher.updateObject(16, b0 | 2);
+            this.dataWatcher.updateObject(16, Byte.valueOf((byte)(b0 | 2)));
         } else
         {
-            this.dataWatcher.updateObject(16, b0 & -3);
+            this.dataWatcher.updateObject(16, Byte.valueOf((byte)(b0 & -3)));
         }
     }
 
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityIceDemon.java b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityIceDemon.java
index 288a0d54..854926e7 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityIceDemon.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityIceDemon.java
@@ -382,10 +382,10 @@ public class EntityIceDemon extends EntityDemon implements IRangedAttackMob
 
         if (par1)
         {
-            this.dataWatcher.updateObject(16, b0 | 2);
+            this.dataWatcher.updateObject(16, Byte.valueOf((byte)(b0 | 2)));
         } else
         {
-            this.dataWatcher.updateObject(16, b0 & -3);
+            this.dataWatcher.updateObject(16, Byte.valueOf((byte)(b0 & -3)));
         }
     }
 
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityLowerGuardian.java b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityLowerGuardian.java
index 35aacd14..e6d9955f 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityLowerGuardian.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityLowerGuardian.java
@@ -366,10 +366,10 @@ public class EntityLowerGuardian extends EntityDemon
 
         if (par1)
         {
-            this.dataWatcher.updateObject(16, b0 | 2);
+            this.dataWatcher.updateObject(16, Byte.valueOf((byte)(b0 | 2)));
         } else
         {
-            this.dataWatcher.updateObject(16, b0 & -3);
+            this.dataWatcher.updateObject(16, Byte.valueOf((byte)(b0 & -3)));
         }
     }
 
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityShade.java b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityShade.java
index cac5c5ac..f73ba7c8 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityShade.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityShade.java
@@ -352,10 +352,10 @@ public class EntityShade extends EntityDemon
 
         if (par1)
         {
-            this.dataWatcher.updateObject(16, b0 | 2);
+            this.dataWatcher.updateObject(16, Byte.valueOf((byte)(b0 | 2)));
         } else
         {
-            this.dataWatcher.updateObject(16, b0 & -3);
+            this.dataWatcher.updateObject(16, Byte.valueOf((byte)(b0 & -3)));
         }
     }
 
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntitySmallEarthGolem.java b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntitySmallEarthGolem.java
index 70cb907c..0ebeb103 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntitySmallEarthGolem.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntitySmallEarthGolem.java
@@ -349,10 +349,10 @@ public class EntitySmallEarthGolem extends EntityDemon implements IRangedAttackM
 
         if (par1)
         {
-            this.dataWatcher.updateObject(16, b0 | 2);
+            this.dataWatcher.updateObject(16, Byte.valueOf((byte)(b0 | 2)));
         } else
         {
-            this.dataWatcher.updateObject(16, b0 & -3);
+            this.dataWatcher.updateObject(16, Byte.valueOf((byte)(b0 & -3)));
         }
     }
 
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityWingedFireDemon.java b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityWingedFireDemon.java
index 0697085d..02389aac 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityWingedFireDemon.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityWingedFireDemon.java
@@ -361,10 +361,10 @@ public class EntityWingedFireDemon extends EntityDemon implements IRangedAttackM
 
         if (par1)
         {
-            this.dataWatcher.updateObject(16, b0 | 2);
+            this.dataWatcher.updateObject(16, Byte.valueOf((byte)(b0 | 2)));
         } else
         {
-            this.dataWatcher.updateObject(16, b0 & -3);
+            this.dataWatcher.updateObject(16, Byte.valueOf((byte)(b0 & -3)));
         }
     }