          {
              return true;
 diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTorch.java ../src_work/minecraft/net/minecraft/src/BlockTorch.java
---- ../src_base/minecraft/net/minecraft/src/BlockTorch.java	2011-08-30 02:13:11.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java	2011-08-30 02:13:13.000000000 -0400
+--- ../src_base/minecraft/net/minecraft/src/BlockTorch.java	2011-08-30 03:13:18.000000000 -0400
++++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java	2011-08-30 03:13:19.000000000 -0400
 @@ -41,24 +41,24 @@
  
      private boolean func_31032_h(World world, int i, int j, int k)

                 flag = true;
             }
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockPressurePlate.java ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java
--- ../src_base/minecraft/net/minecraft/src/BlockPressurePlate.java	2011-08-30 02:13:11.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java	2011-08-30 02:13:13.000000000 -0400
@@ -46,7 +46,7 @@
 
     public boolean canPlaceBlockAt(World world, int i, int j, int k)

+    public int damageVsEntity;
     protected EnumToolMaterial toolMaterial;
 }
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/MetadataChunkBlock.java ../src_work/minecraft_server/net/minecraft/src/MetadataChunkBlock.java
--- ../src_base/minecraft_server/net/minecraft/src/MetadataChunkBlock.java	2011-08-30 03:13:19.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/MetadataChunkBlock.java	2011-08-30 04:13:11.000000000 -0400
@@ -95,7 +95,7 @@
                     } else
                     if(field_957_a == EnumSkyBlock.Block)
                     {
-                        l3 = Block.lightValue[j3];
+			l3 = (j3==0)?0:Block.blocksList[j3].getLightValue(world,k1,k2,l1);
                     }
                     if(k3 >= 15 && l3 == 0)
                     {
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/MovingObjectPosition.java ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java
--- ../src_base/minecraft_server/net/minecraft/src/MovingObjectPosition.java	2011-08-30 03:13:19.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java	2011-08-30 03:13:19.000000000 -0400
@@ -35,4 +35,7 @@
     public int sideHit;
     public Vec3D hitVec;
