      public int difficultySetting;
      public Random rand;
      public boolean isNewWorld;
+Only in ../src_work/minecraft_server/net/minecraft/src: World.java.orig
+Only in ../src_work/minecraft_server/net/minecraft/src: World.java.rej
 diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/WorldServer.java ../src_work/minecraft_server/net/minecraft/src/WorldServer.java
---- ../src_base/minecraft_server/net/minecraft/src/WorldServer.java	2011-09-26 15:46:46.000000000 -0400
-+++ ../src_work/minecraft_server/net/minecraft/src/WorldServer.java	2011-09-30 08:24:14.000000000 -0400
+--- ../src_base/minecraft_server/net/minecraft/src/WorldServer.java	2011-10-02 14:29:22.000000000 -0400
++++ ../src_work/minecraft_server/net/minecraft/src/WorldServer.java	2011-10-02 14:29:22.000000000 -0400
 @@ -54,15 +54,20 @@
      public List getTileEntityList(int i, int j, int k, int l, int i1, int j1)
      {

             return true;
         }
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockContainer.java ../src_work/minecraft_server/net/minecraft/src/BlockContainer.java
--- ../src_base/minecraft_server/net/minecraft/src/BlockContainer.java	2011-09-26 15:46:45.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockContainer.java	2011-09-28 22:34:34.000000000 -0400
@@ -26,7 +26,7 @@
     public void onBlockAdded(World world, int i, int j, int k)
     {

 
     public void harvestBlock(World world, EntityPlayer entityplayer, int i, int j, int k, int l)
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-10-02 14:29:21.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java	2011-10-02 14:29:22.000000000 -0400
@@ -41,24 +41,24 @@
 
     private boolean func_31032_h(World world, int i, int j, int k)
