  
  public class EntityEnderman extends EntityMob
  {
-@@ -275,12 +277,16 @@
+     private static final UUID attackingSpeedBoostModifierUUID = UUID.fromString("020E0DFB-87AE-4653-9556-831010E291A0");
+     private static final AttributeModifier attackingSpeedBoostModifier = (new AttributeModifier(attackingSpeedBoostModifierUUID, "Attacking speed boost", 6.199999809265137D, 0)).setSaved(false);
++    @Deprecated //DO NOT TOUCH THIS EVER
+     private static boolean[] carriableBlocks = new boolean[256];
+     // JAVADOC FIELD $$ field_70828_e
+     private int teleportDelay;
+@@ -161,7 +166,7 @@
+                     j = MathHelper.floor_double(this.posZ - 2.0D + this.rand.nextDouble() * 4.0D);
+                     block = this.worldObj.getBlock(k, i, j);
+ 
+-                    if (carriableBlocks[Block.getIdFromBlock(block)])
++                    if (EntityEnderman.getCarriable(block))
+                     {
+                         this.func_146081_a(block);
+                         this.setCarryingData(this.worldObj.getBlockMetadata(k, i, j));
+@@ -275,12 +280,16 @@
      // JAVADOC METHOD $$ func_70825_j
      protected boolean teleportTo(double par1, double par3, double par5)
      {

--- ../src-base/minecraft/net/minecraft/entity/monster/EntityEnderman.java
+++ ../src-work/minecraft/net/minecraft/entity/monster/EntityEnderman.java
@@ -19,6 +19,8 @@
 import net.minecraft.util.MathHelper;
 import net.minecraft.util.Vec3;
 import net.minecraft.world.World;

         boolean flag = false;
         int i = MathHelper.floor_double(this.posX);
         int j = MathHelper.floor_double(this.posY);
@@ -432,7 +441,7 @@
                     }
                 }
 
