          return itemstack;
 diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemTool.java ../src_work/minecraft_server/net/minecraft/src/ItemTool.java
 --- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java	2011-08-21 03:48:05.000000000 -0400
-+++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java	2011-08-21 03:48:05.000000000 -0400
++++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java	2011-08-27 01:47:55.000000000 -0400
 @@ -4,6 +4,8 @@
  
  package net.minecraft.src;

     public boolean hitEntity(ItemStack itemstack, EntityLiving entityliving, EntityLiving entityliving1)
     {
         itemstack.damageItem(2, entityliving1);
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/MovingObjectPosition.java ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java
--- ../src_base/minecraft/net/minecraft/src/MovingObjectPosition.java	2011-08-21 03:48:04.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java	2011-08-25 03:16:48.000000000 -0400

             int i = entityliving.getItemIcon(itemstack);
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemTool.java ../src_work/minecraft/net/minecraft/src/ItemTool.java
--- ../src_base/minecraft/net/minecraft/src/ItemTool.java	2011-08-21 03:48:04.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/ItemTool.java	2011-08-27 01:47:43.000000000 -0400
@@ -4,6 +4,8 @@
 
 package net.minecraft.src;
