 +        blocksEffectiveAgainst = Arrays.copyOf(blocksEffectiveAgainst,
 +                blocksEffectiveAgainst.length + 1);
 +        
-+        blocksEffectiveAgainst [blocksEffectiveAgainst.length + 1] = block;
++        blocksEffectiveAgainst [blocksEffectiveAgainst.length] = block;
 +    }
  }
 diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerController.java ../src_work/minecraft/net/minecraft/src/PlayerController.java

         for(int j19 = k + 8; j19 < k + 8 + 16; j19++)
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java
--- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java	2011-07-29 23:21:50.320938000 +0200
+++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java	2011-07-30 09:10:42.295216400 +0200
@@ -6,6 +6,8 @@
 
 import java.util.*;

             int i = entityliving.getItemIcon(itemstack);
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemTool.java ../src_work/minecraft/net/minecraft/src/ItemTool.java
--- ../src_base/minecraft/net/minecraft/src/ItemTool.java	2011-07-29 23:21:34.752048000 +0200
+++ ../src_work/minecraft/net/minecraft/src/ItemTool.java	2011-07-30 09:12:08.010119000 +0200
@@ -4,6 +4,7 @@
 
 package net.minecraft.src;
