diff --git a/src/js/net/minecraft/client/render/BlockRenderer.js b/src/js/net/minecraft/client/render/BlockRenderer.js
index e47557c..67f2d3c 100644
--- a/src/js/net/minecraft/client/render/BlockRenderer.js
+++ b/src/js/net/minecraft/client/render/BlockRenderer.js
@@ -263,12 +263,12 @@ export default class BlockRenderer {
     renderBlockInHand(group, block, brightness) {
         this.tessellator.startDrawing();
 
-        // Change brightness
-        this.tessellator.transformBrightness(brightness);
-
         // Render block
         this.renderBlock(null, block, 0, 0, 0);
 
+        // Change brightness
+        this.tessellator.transformBrightness(brightness);
+
         // Create mesh
         let mesh = this.tessellator.draw(group);
         mesh.geometry.center();
diff --git a/src/js/net/minecraft/client/render/entity/entity/PlayerRenderer.js b/src/js/net/minecraft/client/render/entity/entity/PlayerRenderer.js
index 31b55ed..076c496 100644
--- a/src/js/net/minecraft/client/render/entity/entity/PlayerRenderer.js
+++ b/src/js/net/minecraft/client/render/entity/entity/PlayerRenderer.js
@@ -24,7 +24,7 @@ export default class PlayerRenderer extends EntityRenderer {
         let id = entity.inventory.getItemInSelectedSlot();
         if (id !== 0) {
             let block = Block.getById(id);
-            this.worldRenderer.blockRenderer.renderBlockInHand(group, block, 1);
+            this.worldRenderer.blockRenderer.renderBlockInHand(group, block, entity.getEntityBrightness());
         }
     }
 
diff --git a/src/js/net/minecraft/client/world/World.js b/src/js/net/minecraft/client/world/World.js
index a68898d..76e8701 100644
--- a/src/js/net/minecraft/client/world/World.js
+++ b/src/js/net/minecraft/client/world/World.js
@@ -26,13 +26,6 @@ export default class World {
 
         this.time = 0;
 
-        // Generate light brightness table
-        this.lightBrightnessTable = [];
-        for (let i = 0; i <= 15; i++) {
-            let brightness = 1.0 - i / 15;
-            this.lightBrightnessTable[i] = ((1.0 - brightness) / (brightness * 3 + 1.0)) * (1.0 - 0.05) + 0.05;
-        }
-
         // Load world
         this.generator = new WorldGenerator(this, Date.now() % 100000);
 
@@ -500,7 +493,7 @@ export default class World {
 
     getLightBrightness(x, y, z) {
         let level = this.getTotalLightAt(x, y, z);
-        return this.lightBrightnessTable[level];
+        return Math.max(level / 15, 0.1);
     }
 
     getSkyColorByTemp(temperature) {