      {
          return new PositionedSoundRecord(p_184371_0_, SoundCategory.MASTER, 0.25F, p_184371_1_, false, 0, ISound.AttenuationType.NONE, 0.0F, 0.0F, 0.0F);
      }
+diff --git a/src/net/minecraft/client/entity/AbstractClientPlayer.java b/src/net/minecraft/client/entity/AbstractClientPlayer.java
+index c30247b..1fd170a 100644
+--- a/src/net/minecraft/client/entity/AbstractClientPlayer.java
++++ b/src/net/minecraft/client/entity/AbstractClientPlayer.java
+@@ -146,9 +146,9 @@ public abstract class AbstractClientPlayer extends EntityPlayer
+             f = 1.0F;
+         }
+ 
+-        if (this.func_184587_cr() && this.func_184607_cu() != null && this.func_184607_cu().getItem() == Items.bow)
++        if (this.isUsingItem() && this.func_184607_cu() != null && this.func_184607_cu().getItem() == Items.bow)
+         {
+-            int i = this.func_184612_cw();
++            int i = this.getItemInUseDuration();
+             float f1 = (float)i / 20.0F;
+ 
+             if (f1 > 1.0F)
 diff --git a/src/net/minecraft/client/entity/EntityPlayerSP.java b/src/net/minecraft/client/entity/EntityPlayerSP.java
-index 61b85c2..5793cc2 100644
+index 61b85c2..8d534c7 100644
 --- a/src/net/minecraft/client/entity/EntityPlayerSP.java
 +++ b/src/net/minecraft/client/entity/EntityPlayerSP.java
 @@ -1,5 +1,6 @@

     }
 
     public void swingArm(EnumHand hand)
@@ -847,7 +941,7 @@ public class EntityPlayerSP extends AbstractClientPlayer
 
             if (this.timeInPortal == 0.0F)

         this.worldObj.setEntityState(this, (byte)16);
     }
diff --git a/src/net/minecraft/entity/player/EntityPlayer.java b/src/net/minecraft/entity/player/EntityPlayer.java
index 23d8999..542b3e6 100644
--- a/src/net/minecraft/entity/player/EntityPlayer.java
+++ b/src/net/minecraft/entity/player/EntityPlayer.java
@@ -3,15 +3,20 @@ package net.minecraft.entity.player;
