      }
  
      public void saveWorldIndirectly(IProgressUpdate iprogressupdate)
-@@ -2425,6 +2437,7 @@
+@@ -2425,6 +2438,7 @@
          {
              block = null;
          }

     }
 
     public boolean blockExists(int i, int j, int k)
@@ -1408,7 +1412,10 @@
                         if(j2 == Block.fire.blockID || j2 == Block.lavaMoving.blockID || j2 == Block.lavaStill.blockID)
                         {
                             return true;

     {
         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-30 03:13:18.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java	2011-08-30 03:13:19.000000000 -0400
@@ -4,6 +4,8 @@
 
 package net.minecraft.src;
