  
 diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/WorldRenderer.java ../src_work/minecraft/net/minecraft/src/WorldRenderer.java
 --- ../src_base/minecraft/net/minecraft/src/WorldRenderer.java	2011-08-04 20:51:17.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java	2011-08-05 07:07:18.000000000 -0400
-@@ -3,8 +3,12 @@
- // Decompiler options: packimports(3) braces deadcode 
- 
- package net.minecraft.src;
-+import net.minecraft.src.forge.*;
++++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java	2011-08-08 12:37:17.000000000 -0400
+@@ -5,6 +5,9 @@
+ package net.minecraft.src;
  
  import java.util.*;
 +

             } else
             {
                 flag1 = false;
@@ -251,7 +258,6 @@
 
     public World worldObj;
     private int glRenderList;

     private RenderEngine renderer;
     private Random rand;
 }
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityLiving.java ../src_work/minecraft/net/minecraft/src/EntityLiving.java
--- ../src_base/minecraft/net/minecraft/src/EntityLiving.java	2011-08-04 20:51:17.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java	2011-08-08 12:43:24.000000000 -0400
@@ -555,7 +555,9 @@
         int i = MathHelper.floor_double(posX);
         int j = MathHelper.floor_double(boundingBox.minY);
         int k = MathHelper.floor_double(posZ);
-        return worldObj.getBlockId(i, j, k) == Block.ladder.blockID;
+	Block block=Block.blocksList[worldObj.getBlockId(i,j,k)];
+	if(block==null) return false;
+	return block.isLadder();
     }
 
     public void writeEntityToNBT(NBTTagCompound nbttagcompound)
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityPlayer.java ../src_work/minecraft/net/minecraft/src/EntityPlayer.java
--- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java	2011-08-04 20:51:17.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java	2011-08-05 07:07:18.000000000 -0400
