From 5c229dd6c71e78d12a4322e9b6062108571a015e Mon Sep 17 00:00:00 2001
From: AlgorithmX2 <AlgorithmX2@gmail.com>
Date: Wed, 17 Feb 2016 14:14:18 -0600
Subject: [PATCH] Fix bug with getLightOpacity based on TileEntities, Capture
 getLightOpacity prior to removing the tile entity.

---
 .../net/minecraft/world/chunk/Chunk.java.patch      | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/patches/minecraft/net/minecraft/world/chunk/Chunk.java.patch b/patches/minecraft/net/minecraft/world/chunk/Chunk.java.patch
index 231c4aeb2..9f9c2fefc 100644
--- a/patches/minecraft/net/minecraft/world/chunk/Chunk.java.patch
+++ b/patches/minecraft/net/minecraft/world/chunk/Chunk.java.patch
@@ -24,7 +24,15 @@
      }
  
      private Block func_150810_a(int p_150810_1_, int p_150810_2_, int p_150810_3_)
-@@ -623,14 +623,19 @@
+@@ -607,6 +607,7 @@
+         {
+             Block block = p_177436_2_.func_177230_c();
+             Block block1 = iblockstate.func_177230_c();
++            int k1 = block1.getLightOpacity(this.field_76637_e, p_177436_1_); // Relocate old light value lookup here, so that it is called before TE is removed.
+             ExtendedBlockStorage extendedblockstorage = this.field_76652_q[j >> 4];
+             boolean flag = false;
+ 
+@@ -623,14 +624,19 @@
  
              extendedblockstorage.func_177484_a(i, j & 15, k, p_177436_2_);
  
@@ -46,14 +54,13 @@
                      this.field_76637_e.func_175713_t(p_177436_1_);
                  }
              }
-@@ -647,8 +652,8 @@
+@@ -647,8 +653,7 @@
                  }
                  else
                  {
 -                    int j1 = block.func_149717_k();
 -                    int k1 = block1.func_149717_k();
 +                    int j1 = block.getLightOpacity(this.field_76637_e, p_177436_1_);
-+                    int k1 = block1.getLightOpacity(this.field_76637_e, p_177436_1_);
  
                      if (j1 > 0)
                      {