From cd2982f9b1e6967ad9084bee081a8391580f3b89 Mon Sep 17 00:00:00 2001
From: Lex Manos <LexManos@gmail.com>
Date: Sat, 2 Aug 2014 11:32:34 -0700
Subject: [PATCH] Closes #1280

---
 .../minecraft/world/chunk/Chunk.java.patch    | 38 ++++++++++---------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/patches/minecraft/net/minecraft/world/chunk/Chunk.java.patch b/patches/minecraft/net/minecraft/world/chunk/Chunk.java.patch
index a3c34279f..eadf39303 100644
--- a/patches/minecraft/net/minecraft/world/chunk/Chunk.java.patch
+++ b/patches/minecraft/net/minecraft/world/chunk/Chunk.java.patch
@@ -40,11 +40,9 @@
              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)
+@@ -590,27 +598,34 @@
              {
                  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))
@@ -58,8 +56,14 @@
 +                }
              }
  
++            if (!block1.hasTileEntity(k1))
++            {
++                extendedblockstorage.func_76654_b(p_150807_1_, p_150807_2_ & 15, p_150807_3_, p_150807_5_); // Don't do this if we alredy have in the TE code above.
++            }
++
              if (extendedblockstorage.func_150819_a(p_150807_1_, p_150807_2_ & 15, p_150807_3_) != p_150807_4_)
-@@ -601,16 +615,13 @@
+             {
+                 return false;
              }
              else
              {
@@ -77,7 +81,7 @@
  
                      if (j2 > 0)
                      {
-@@ -632,34 +643,19 @@
+@@ -632,34 +647,19 @@
  
                  TileEntity tileentity;
  
@@ -114,7 +118,7 @@
                      }
                  }
  
-@@ -690,7 +686,7 @@
+@@ -690,7 +690,7 @@
                  this.field_76643_l = true;
                  extendedblockstorage.func_76654_b(p_76589_1_, p_76589_2_ & 15, p_76589_3_, p_76589_4_);
  
@@ -123,7 +127,7 @@
                  {
                      TileEntity tileentity = this.func_150806_e(p_76589_1_, p_76589_2_, p_76589_3_);
  
-@@ -790,6 +786,7 @@
+@@ -790,6 +790,7 @@
              k = this.field_76645_j.length - 1;
          }
  
@@ -131,7 +135,7 @@
          p_76612_1_.field_70175_ag = true;
          p_76612_1_.field_70176_ah = this.field_76635_g;
          p_76612_1_.field_70162_ai = k;
-@@ -827,28 +824,27 @@
+@@ -827,28 +828,27 @@
          ChunkPosition chunkposition = new ChunkPosition(p_150806_1_, p_150806_2_, p_150806_3_);
          TileEntity tileentity = (TileEntity)this.field_150816_i.get(chunkposition);
  
@@ -170,7 +174,7 @@
      }
  
      public void func_150813_a(TileEntity p_150813_1_)
-@@ -860,7 +856,7 @@
+@@ -860,7 +860,7 @@
  
          if (this.field_76636_d)
          {
@@ -179,7 +183,7 @@
          }
      }
  
-@@ -872,7 +868,8 @@
+@@ -872,7 +872,8 @@
          p_150812_4_.field_145848_d = p_150812_2_;
          p_150812_4_.field_145849_e = this.field_76647_h * 16 + p_150812_3_;
  
@@ -189,7 +193,7 @@
          {
              if (this.field_150816_i.containsKey(chunkposition))
              {
-@@ -916,6 +913,7 @@
+@@ -916,6 +917,7 @@
  
              this.field_76637_e.func_72868_a(this.field_76645_j[i]);
          }
@@ -197,7 +201,7 @@
      }
  
      public void func_76623_d()
-@@ -933,6 +931,7 @@
+@@ -933,6 +935,7 @@
          {
              this.field_76637_e.func_72828_b(this.field_76645_j[i]);
          }
@@ -205,7 +209,7 @@
      }
  
      public void func_76630_e()
-@@ -942,8 +941,8 @@
+@@ -942,8 +945,8 @@
  
      public void func_76588_a(Entity p_76588_1_, AxisAlignedBB p_76588_2_, List p_76588_3_, IEntitySelector p_76588_4_)
      {
@@ -216,7 +220,7 @@
          i = MathHelper.func_76125_a(i, 0, this.field_76645_j.length - 1);
          j = MathHelper.func_76125_a(j, 0, this.field_76645_j.length - 1);
  
-@@ -979,8 +978,8 @@
+@@ -979,8 +982,8 @@
  
      public void func_76618_a(Class p_76618_1_, AxisAlignedBB p_76618_2_, List p_76618_3_, IEntitySelector p_76618_4_)
      {
@@ -227,7 +231,7 @@
          i = MathHelper.func_76125_a(i, 0, this.field_76645_j.length - 1);
          j = MathHelper.func_76125_a(j, 0, this.field_76645_j.length - 1);
  
-@@ -1139,6 +1138,15 @@
+@@ -1139,6 +1142,15 @@
      @SideOnly(Side.CLIENT)
      public void func_76607_a(byte[] p_76607_1_, int p_76607_2_, int p_76607_3_, boolean p_76607_4_)
      {
@@ -243,7 +247,7 @@
          int k = 0;
          boolean flag1 = !this.field_76637_e.field_73011_w.field_76576_e;
          int l;
-@@ -1241,13 +1249,27 @@
+@@ -1241,13 +1253,27 @@
          this.field_150814_l = true;
          this.field_76646_k = true;
          this.func_76590_a();
@@ -272,7 +276,7 @@
      }
  
      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;
      }