-From 88574792ddc0eb4cc267a9c67058dd122aad5a59 Mon Sep 17 00:00:00 2001
+From f42dad548b5f0ec2cf8102415630c11db00d392c Mon Sep 17 00:00:00 2001
 From: Alexander01998 <contact.wurstimperium@gmail.com>
-Date: Tue, 5 Apr 2016 13:02:21 +0200
+Date: Wed, 6 Apr 2016 09:53:55 +0200
 Subject: [PATCH] Wurst
 
 ---

 import net.minecraft.block.Block;
 import net.minecraft.block.BlockLadder;
 import net.minecraft.block.BlockTrapDoor;
@@ -836,14 +840,14 @@ public abstract class EntityLivingBase extends Entity
         return this.getCreatureAttribute() == EnumCreatureAttribute.UNDEAD;
     }

                 if (!this.isInLava() || this instanceof EntityPlayer && ((EntityPlayer)this).capabilities.isFlying)
                 {
                     if (this.func_184613_cA())
@@ -2608,7 +2622,7 @@ public abstract class EntityLivingBase extends Entity
 
     public abstract EnumHandSide getPrimaryHand();
 
-    public boolean func_184587_cr()
+    public boolean isUsingItem()
     {
         return (((Byte)this.dataWatcher.get(field_184621_as)).byteValue() & 1) > 0;
     }
@@ -2620,15 +2634,15 @@ public abstract class EntityLivingBase extends Entity
 
     protected void func_184608_ct()
     {
-        if (this.func_184587_cr())
+        if (this.isUsingItem())
         {
             ItemStack itemstack = this.getHeldItem(this.func_184600_cs());
 
-            if (itemstack == this.field_184627_bm)
+            if (itemstack == this.itemInUse)
             {
                 if (this.getItemInUseCount() <= 25 && this.getItemInUseCount() % 4 == 0)
                 {
-                    this.func_184584_a(this.field_184627_bm, 5);
+                    this.func_184584_a(this.itemInUse, 5);
                 }
 
                 if (--this.field_184628_bn == 0 && !this.worldObj.isRemote)
@@ -2647,9 +2661,9 @@ public abstract class EntityLivingBase extends Entity
     {
         ItemStack itemstack = this.getHeldItem(p_184598_1_);
 
-        if (itemstack != null && !this.func_184587_cr())
+        if (itemstack != null && !this.isUsingItem())
         {
-            this.field_184627_bm = itemstack;
+            this.itemInUse = itemstack;
             this.field_184628_bn = itemstack.getMaxItemUseDuration();
 
             if (!this.worldObj.isRemote)
@@ -2672,18 +2686,18 @@ public abstract class EntityLivingBase extends Entity
 
         if (field_184621_as.equals(key) && this.worldObj.isRemote)
         {
-            if (this.func_184587_cr() && this.field_184627_bm == null)
+            if (this.isUsingItem() && this.itemInUse == null)
             {
-                this.field_184627_bm = this.getHeldItem(this.func_184600_cs());
+                this.itemInUse = this.getHeldItem(this.func_184600_cs());
 
-                if (this.field_184627_bm != null)
+                if (this.itemInUse != null)
                 {
-                    this.field_184628_bn = this.field_184627_bm.getMaxItemUseDuration();
+                    this.field_184628_bn = this.itemInUse.getMaxItemUseDuration();
                 }
             }
-            else if (!this.func_184587_cr() && this.field_184627_bm != null)
+            else if (!this.isUsingItem() && this.itemInUse != null)
             {
-                this.field_184627_bm = null;
+                this.itemInUse = null;
                 this.field_184628_bn = 0;
             }
         }
@@ -2691,7 +2705,7 @@ public abstract class EntityLivingBase extends Entity
 
     protected void func_184584_a(ItemStack p_184584_1_, int p_184584_2_)
     {
-        if (p_184584_1_ != null && this.func_184587_cr())
+        if (p_184584_1_ != null && this.isUsingItem())
         {
             if (p_184584_1_.getItemUseAction() == EnumAction.DRINK)
             {
@@ -2731,10 +2745,10 @@ public abstract class EntityLivingBase extends Entity
      */
     protected void onItemUseFinish()
     {
-        if (this.field_184627_bm != null && this.func_184587_cr())
+        if (this.itemInUse != null && this.isUsingItem())
         {
-            this.func_184584_a(this.field_184627_bm, 16);
-            ItemStack itemstack = this.field_184627_bm.onItemUseFinish(this.worldObj, this);
+            this.func_184584_a(this.itemInUse, 16);
+            ItemStack itemstack = this.itemInUse.onItemUseFinish(this.worldObj, this);
 
             if (itemstack != null && itemstack.stackSize == 0)
             {
@@ -2748,7 +2762,7 @@ public abstract class EntityLivingBase extends Entity
 
     public ItemStack func_184607_cu()
     {
-        return this.field_184627_bm;
+        return this.itemInUse;
     }
 
     public int getItemInUseCount()
@@ -2756,16 +2770,16 @@ public abstract class EntityLivingBase extends Entity
         return this.field_184628_bn;
     }
 
-    public int func_184612_cw()
+    public int getItemInUseDuration()
     {
-        return this.func_184587_cr() ? this.field_184627_bm.getMaxItemUseDuration() - this.getItemInUseCount() : 0;
+        return this.isUsingItem() ? this.itemInUse.getMaxItemUseDuration() - this.getItemInUseCount() : 0;
     }
 
     public void func_184597_cx()
     {
-        if (this.field_184627_bm != null)
+        if (this.itemInUse != null)
         {
-            this.field_184627_bm.onPlayerStoppedUsing(this.worldObj, this, this.getItemInUseCount());
+            this.itemInUse.onPlayerStoppedUsing(this.worldObj, this, this.getItemInUseCount());
         }
 
         this.func_184602_cy();
@@ -2778,16 +2792,16 @@ public abstract class EntityLivingBase extends Entity
             this.dataWatcher.set(field_184621_as, Byte.valueOf((byte)0));
         }
 
-        this.field_184627_bm = null;
+        this.itemInUse = null;
         this.field_184628_bn = 0;
     }
 
     public boolean func_184585_cz()
     {
-        if (this.func_184587_cr() && this.field_184627_bm != null)
+        if (this.isUsingItem() && this.itemInUse != null)
         {
-            Item item = this.field_184627_bm.getItem();
-            return item.getItemUseAction(this.field_184627_bm) != EnumAction.BLOCK ? false : item.getMaxItemUseDuration(this.field_184627_bm) - this.field_184628_bn >= 5;
+            Item item = this.itemInUse.getItem();
+            return item.getItemUseAction(this.itemInUse) != EnumAction.BLOCK ? false : item.getMaxItemUseDuration(this.itemInUse) - this.field_184628_bn >= 5;
         }
         else
         {
diff --git a/src/net/minecraft/entity/ai/EntityAIAttackRangedBow.java b/src/net/minecraft/entity/ai/EntityAIAttackRangedBow.java
index b5de1b7..a30c530 100644
--- a/src/net/minecraft/entity/ai/EntityAIAttackRangedBow.java
+++ b/src/net/minecraft/entity/ai/EntityAIAttackRangedBow.java
@@ -141,7 +141,7 @@ public class EntityAIAttackRangedBow extends EntityAIBase
                 this.field_188499_a.getLookHelper().setLookPositionWithEntity(entitylivingbase, 30.0F, 30.0F);
             }
 
-            if (this.field_188499_a.func_184587_cr())
+            if (this.field_188499_a.isUsingItem())
             {
                 if (!flag && this.field_188504_f < -60)
                 {
@@ -149,7 +149,7 @@ public class EntityAIAttackRangedBow extends EntityAIBase
                 }
                 else if (flag)
                 {
-                    int i = this.field_188499_a.func_184612_cw();
+                    int i = this.field_188499_a.getItemInUseDuration();
 
                     if (i >= 20)
                     {
diff --git a/src/net/minecraft/entity/monster/EntityMob.java b/src/net/minecraft/entity/monster/EntityMob.java
index f54bf34..cb986d9 100644
--- a/src/net/minecraft/entity/monster/EntityMob.java
+++ b/src/net/minecraft/entity/monster/EntityMob.java
@@ -128,7 +128,7 @@ public abstract class EntityMob extends EntityCreature implements IMob
             {
                 EntityPlayer entityplayer = (EntityPlayer)entityIn;
                 ItemStack itemstack = this.getHeldItemMainhand();
-                ItemStack itemstack1 = entityplayer.func_184587_cr() ? entityplayer.func_184607_cu() : null;
+                ItemStack itemstack1 = entityplayer.isUsingItem() ? entityplayer.func_184607_cu() : null;
 
                 if (itemstack != null && itemstack1 != null && itemstack.getItem() instanceof ItemAxe && itemstack1.getItem() == Items.shield)
                 {
diff --git a/src/net/minecraft/entity/monster/EntityZombie.java b/src/net/minecraft/entity/monster/EntityZombie.java
index a65657e..9d9e562 100644
--- a/src/net/minecraft/entity/monster/EntityZombie.java
