                  this.mc.displayGuiScreen((GuiScreen)null);
              }
 diff --git a/src/net/minecraft/client/multiplayer/PlayerControllerMP.java b/src/net/minecraft/client/multiplayer/PlayerControllerMP.java
-index a54fc8f..86872c9 100644
+index a54fc8f..f02d560 100644
 --- a/src/net/minecraft/client/multiplayer/PlayerControllerMP.java
 +++ b/src/net/minecraft/client/multiplayer/PlayerControllerMP.java
 @@ -1,5 +1,7 @@

 src/net/minecraft/entity/monster/EntityMob.java    |   4 +-
 src/net/minecraft/entity/monster/EntitySpider.java |   2 +-
 src/net/minecraft/entity/monster/EntityZombie.java |   2 +-
 src/net/minecraft/entity/player/EntityPlayer.java  |  31 ++--
 .../minecraft/entity/player/EntityPlayerMP.java    |   4 +-
 .../minecraft/entity/projectile/EntityPotion.java  |   4 +-
 .../entity/projectile/EntityTippedArrow.java       |   2 +-
 src/net/minecraft/item/Item.java                   |   2 +-

             {
                 return EnumActionResult.PASS;
             }
@@ -520,7 +539,7 @@ public class PlayerControllerMP
         if (this.currentGameType != WorldSettings.GameType.SPECTATOR)
         {
             playerIn.attackTargetEntityWithCurrentItem(targetEntity);
-            playerIn.func_184821_cY();
+            playerIn.resetSwordCooldown();
         }
     }
 
@@ -539,7 +558,7 @@ public class PlayerControllerMP
         return this.currentGameType == WorldSettings.GameType.SPECTATOR ? EnumActionResult.PASS : p_187102_2_.func_184199_a(p_187102_1_, vec3d, p_187102_4_, p_187102_5_);
     }
