 --- ../src_base/common/net/minecraft/src/Entity.java
 +++ ../src_work/common/net/minecraft/src/Entity.java
-@@ -2,9 +2,12 @@
- 
- import cpw.mods.fml.common.Side;
- import cpw.mods.fml.common.asm.SideOnly;
-+
-+import java.util.ArrayList;
+@@ -5,6 +5,8 @@
  import java.util.Iterator;
  import java.util.List;
  import java.util.Random;
 +import java.util.UUID;
++import java.util.ArrayList;
+ import net.minecraft.server.MinecraftServer;
  
  public abstract class Entity
- {
-@@ -186,6 +189,11 @@
-     public boolean ignoreFrustumCheck;
-     public boolean isAirBorne;
+@@ -197,6 +199,11 @@
+     public int dimension;
+     protected int field_82152_aq;
      public EnumEntitySize myEntitySize;
 +    /** Forge: Used to store custom data for each entity. */
 +    private NBTTagCompound customEntityData;

         this.readEntityFromNBT(par1NBTTagCompound);
     }
 
@@ -1509,7 +1534,14 @@
     {
         EntityItem var3 = new EntityItem(this.worldObj, this.posX, this.posY + (double)par2, this.posZ, par1ItemStack);
         var3.delayBeforeCanPickup = 10;

     }
 
     /**
@@ -2262,7 +2293,7 @@
 
     public float func_82146_a(Explosion par1Explosion, Block par2Block, int par3, int par4, int par5)
     {
-        return par2Block.getExplosionResistance(this);
+        return par2Block.getExplosionResistance(this, worldObj, par3, par4, par5, posX, posY + (double)getEyeHeight(), posZ);
     }
 
     public int func_82143_as()
@@ -2279,4 +2310,84 @@
     {
         return false;
     }
+
+    /* ================================== Forge Start =====================================*/
