      }
  
      public BiomeGenBase func_76591_a(int p_76591_1_, int p_76591_2_, WorldChunkManager p_76591_3_)
-@@ -1450,4 +1472,48 @@
+@@ -1450,4 +1476,48 @@
  
          return true;
      }

             if (!this.field_76637_e.field_72995_K)
             {
                 block1.func_149725_f(this.field_76637_e, l1, p_150807_2_, i2, k1);
@@ -589,10 +597,16 @@
             if (!this.field_76637_e.field_72995_K)
             {
                 block1.func_149749_a(this.field_76637_e, l1, p_150807_2_, i2, block1, k1);
+                extendedblockstorage.func_76654_b(p_150807_1_, p_150807_2_ & 15, p_150807_3_, p_150807_5_); // This needs to be below block break as it some breaks depend on this ordering {redstone/lava}
             }
-            else if (block1 instanceof ITileEntityProvider && block1 != p_150807_4_)
+            else if (block1.hasTileEntity(k1))

         int k = 0;
         boolean flag1 = !this.field_76637_e.field_73011_w.field_76576_e;
         int l;
@@ -1241,13 +1253,27 @@
         this.field_150814_l = true;
         this.field_76646_k = true;
         this.func_76590_a();
