                  this.playSound(SoundEvents.item_shield_break, 0.8F, 0.8F + this.worldObj.rand.nextFloat() * 0.4F);
              }
          }
+@@ -1259,7 +1268,7 @@ public abstract class EntityPlayer extends EntityLivingBase
+                     f1 = EnchantmentHelper.getModifierForCreature(this.getHeldItemMainhand(), EnumCreatureAttribute.UNDEFINED);
+                 }
+ 
+-                float f2 = this.func_184825_o(0.5F);
++                float f2 = this.getSwordCooldown(0.5F);
+                 f = f * (0.2F + f2 * f2 * 0.8F);
+                 f1 = f1 * f2;
+                 this.func_184821_cY();
 @@ -1390,7 +1399,7 @@ public abstract class EntityPlayer extends EntityLivingBase
                          {
                              EntityPlayer entityplayer = (EntityPlayer)targetEntity;

 
                 if (itemstack != null && itemstack1 != null && itemstack.getItem() instanceof ItemAxe && itemstack1.getItem() == Items.shield)
                 {
diff --git a/src/net/minecraft/entity/monster/EntitySpider.java b/src/net/minecraft/entity/monster/EntitySpider.java
index da8b120..e4e3531 100644
--- a/src/net/minecraft/entity/monster/EntitySpider.java

             }
         });
     }
diff --git a/src/net/minecraft/item/ItemChorusFruit.java b/src/net/minecraft/item/ItemChorusFruit.java
index ba54b68..f662adb 100644
--- a/src/net/minecraft/item/ItemChorusFruit.java
+++ b/src/net/minecraft/item/ItemChorusFruit.java
@@ -44,7 +44,7 @@ public class ItemChorusFruit extends ItemFood
 
             if (playerIn instanceof EntityPlayer)
             {
-                ((EntityPlayer)playerIn).func_184811_cZ().setCooldown(this, 20);
+                ((EntityPlayer)playerIn).getCooldownTracker().setCooldown(this, 20);
             }
         }
 
diff --git a/src/net/minecraft/item/ItemEnderPearl.java b/src/net/minecraft/item/ItemEnderPearl.java
index ba5168f..7c55c39 100644
--- a/src/net/minecraft/item/ItemEnderPearl.java
+++ b/src/net/minecraft/item/ItemEnderPearl.java
@@ -27,7 +27,7 @@ public class ItemEnderPearl extends Item
         }
 
         worldIn.func_184148_a((EntityPlayer)null, playerIn.posX, playerIn.posY, playerIn.posZ, SoundEvents.entity_enderpearl_throw, SoundCategory.NEUTRAL, 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F));
-        playerIn.func_184811_cZ().setCooldown(this, 20);
+        playerIn.getCooldownTracker().setCooldown(this, 20);
 
         if (!worldIn.isRemote)
         {
diff --git a/src/net/minecraft/item/ItemShield.java b/src/net/minecraft/item/ItemShield.java
index b98ca23..f3e4bed 100644
--- a/src/net/minecraft/item/ItemShield.java
