                  if(world.getBlockMaterial(i, j, k) == Material.water && world.getBlockMetadata(i, j, k) == 0)
                  {
                      world.setBlockWithNotify(i, j, k, 0);
+diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemDye.java ../src_work/minecraft/net/minecraft/src/ItemDye.java
+--- ../src_base/minecraft/net/minecraft/src/ItemDye.java	2011-09-21 22:59:06.000000000 -0400
++++ ../src_work/minecraft/net/minecraft/src/ItemDye.java	2011-09-22 06:02:44.000000000 -0400
+@@ -35,7 +35,7 @@
+ 
+     public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l)
+     {
+-        if(!entityplayer.func_35190_e(i, j, k))
++        if(entityplayer!=null && !entityplayer.func_35190_e(i, j, k))
+         {
+             return false;
+         }
+diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemFlintAndSteel.java ../src_work/minecraft/net/minecraft/src/ItemFlintAndSteel.java
+--- ../src_base/minecraft/net/minecraft/src/ItemFlintAndSteel.java	2011-09-21 22:59:06.000000000 -0400
++++ ../src_work/minecraft/net/minecraft/src/ItemFlintAndSteel.java	2011-09-22 06:02:54.000000000 -0400
+@@ -46,7 +46,7 @@
+         {
+             i++;
+         }
+-        if(!entityplayer.func_35190_e(i, j, k))
++        if(entityplayer!=null && !entityplayer.func_35190_e(i, j, k))
+         {
+             return false;
+         }
+diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemHoe.java ../src_work/minecraft/net/minecraft/src/ItemHoe.java
+--- ../src_base/minecraft/net/minecraft/src/ItemHoe.java	2011-09-21 22:59:06.000000000 -0400
++++ ../src_work/minecraft/net/minecraft/src/ItemHoe.java	2011-09-22 06:03:24.000000000 -0400
+@@ -21,7 +21,7 @@
+ 
+     public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l)
+     {
+-        if(!entityplayer.func_35190_e(i, j, k))
++        if(entityplayer!=null && !entityplayer.func_35190_e(i, j, k))
+         {
+             return false;
+         }
 diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Item.java ../src_work/minecraft/net/minecraft/src/Item.java
 --- ../src_base/minecraft/net/minecraft/src/Item.java	2011-09-21 22:59:06.000000000 -0400
 +++ ../src_work/minecraft/net/minecraft/src/Item.java	2011-09-21 22:59:09.000000000 -0400

+    private Map metaSmeltingList;
 
 }
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java
--- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java	2011-09-21 22:59:08.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java	2011-09-21 22:59:09.000000000 -0400

     public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer)
     {
         return itemstack;
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemRedstone.java ../src_work/minecraft_server/net/minecraft/src/ItemRedstone.java
--- ../src_base/minecraft_server/net/minecraft/src/ItemRedstone.java	2011-09-21 22:59:08.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/ItemRedstone.java	2011-09-22 06:05:19.000000000 -0400
@@ -50,7 +50,7 @@
                 return false;
             }
         }
-        if(!entityplayer.func_35200_c(i, j, k))
+        if(entityplayer!=null && !entityplayer.func_35200_c(i, j, k))
         {
             return false;
         }
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemReed.java ../src_work/minecraft_server/net/minecraft/src/ItemReed.java
--- ../src_base/minecraft_server/net/minecraft/src/ItemReed.java	2011-09-21 22:59:08.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/ItemReed.java	2011-09-22 06:05:35.000000000 -0400
@@ -52,7 +52,7 @@
                 i++;
             }
         }
-        if(!entityplayer.func_35200_c(i, j, k))
+        if(entityplayer!=null && !entityplayer.func_35200_c(i, j, k))
         {
             return false;
         }
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemSeeds.java ../src_work/minecraft_server/net/minecraft/src/ItemSeeds.java
--- ../src_base/minecraft_server/net/minecraft/src/ItemSeeds.java	2011-09-21 22:59:08.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/ItemSeeds.java	2011-09-22 06:05:28.000000000 -0400
@@ -24,7 +24,7 @@
         {
             return false;
         }
-        if(!entityplayer.func_35200_c(i, j, k) || !entityplayer.func_35200_c(i, j + 1, k))
+        if(entityplayer!=null && (!entityplayer.func_35200_c(i, j, k) || !entityplayer.func_35200_c(i, j + 1, k)))
         {
             return false;
         }
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-09-21 22:59:07.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java	2011-09-21 22:59:09.000000000 -0400
