          }
      }
 diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.java ../src_work/minecraft/net/minecraft/src/World.java
---- ../src_base/minecraft/net/minecraft/src/World.java	2011-09-26 15:46:44.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/World.java	2011-09-28 22:34:34.000000000 -0400
+--- ../src_base/minecraft/net/minecraft/src/World.java	2011-10-02 14:29:20.000000000 -0400
++++ ../src_work/minecraft/net/minecraft/src/World.java	2011-10-02 14:29:22.000000000 -0400
 @@ -336,7 +336,10 @@
  
      public boolean isAirBlock(int i, int j, int k)

             GLAllocation.generateTextureNames(singleIntBuffer);
             int i = singleIntBuffer.get(0);
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderGlobal.java ../src_work/minecraft/net/minecraft/src/RenderGlobal.java
--- ../src_base/minecraft/net/minecraft/src/RenderGlobal.java	2011-09-26 15:46:44.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java	2011-09-28 22:34:34.000000000 -0400
@@ -1635,8 +1635,8 @@
     }
 

                 flag = true;
             }
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockPressurePlate.java ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java
--- ../src_base/minecraft_server/net/minecraft/src/BlockPressurePlate.java	2011-10-02 14:29:22.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java	2011-10-02 14:29:22.000000000 -0400
@@ -46,7 +46,8 @@
 
     public boolean canPlaceBlockAt(World world, int i, int j, int k)
