 --- ../src-base/minecraft/net/minecraft/entity/EntityLivingBase.java
 +++ ../src-work/minecraft/net/minecraft/entity/EntityLivingBase.java
-@@ -190,9 +190,11 @@
+@@ -189,10 +189,11 @@
+         {
              float f = (float)MathHelper.func_76123_f(this.field_70143_R - 3.0F);
  
-             if (p_184231_4_.func_185904_a() != Material.field_151579_a)
-+            if (p_184231_4_.func_177230_c().isAir(p_184231_4_, field_70170_p, p_184231_5_))
+-            if (p_184231_4_.func_185904_a() != Material.field_151579_a)
++            if (!p_184231_4_.func_177230_c().isAir(p_184231_4_, field_70170_p, p_184231_5_))
              {
                  double d0 = Math.min((double)(0.2F + f / 15.0F), 2.5D);
                  int i = (int)(150.0D * d0);

         }
 
         this.func_184602_cy();
@@ -2626,4 +2707,28 @@
     {
         return true;
     }

         float f = this.func_110143_aJ();
 
         if (f > 0.0F)
@@ -795,6 +799,7 @@
 
     public boolean func_70097_a(DamageSource p_70097_1_, float p_70097_2_)
     {
