From cba12aabe03aa8021b1ef6332e8bb3a80c335b84 Mon Sep 17 00:00:00 2001
From: Ellpeck <megamaximal@gmail.com>
Date: Sun, 14 Aug 2016 23:38:32 +0200
Subject: [PATCH] Made the smiley cloud not crash with blocks without items
 Closes #208

---
 .../mod/misc/cloud/SmileyCloudEasterEggs.java |  2 +-
 .../actuallyadditions/mod/util/AssetUtil.java | 20 ++++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/cloud/SmileyCloudEasterEggs.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/cloud/SmileyCloudEasterEggs.java
index 3c4fa9f73..a227face1 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/cloud/SmileyCloudEasterEggs.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/cloud/SmileyCloudEasterEggs.java
@@ -91,7 +91,7 @@ public final class SmileyCloudEasterEggs{
             @Override
             public void renderExtra(float f){
                 renderHoldingItem(true, new ItemStack(Items.MILK_BUCKET));
-                renderHeadBlock(Blocks.LIT_REDSTONE_LAMP, 0, 35F);
+                renderHeadBlock(Blocks.REDSTONE_LAMP, 0, 35F);
             }
         });
         //Vazkii
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java
index 4dbff622f..2f03aa888 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java
@@ -62,15 +62,17 @@ public final class AssetUtil{
 
     @SideOnly(Side.CLIENT)
     public static void renderItemInWorld(ItemStack stack){
-        GlStateManager.pushMatrix();
-        GlStateManager.disableLighting();
-        GlStateManager.pushAttrib();
-        RenderHelper.enableStandardItemLighting();
-        Minecraft.getMinecraft().getRenderItem().renderItem(stack, TransformType.FIXED);
-        RenderHelper.disableStandardItemLighting();
-        GlStateManager.popAttrib();
-        GlStateManager.enableLighting();
-        GlStateManager.popMatrix();
+        if(stack != null && stack.getItem() != null){
+            GlStateManager.pushMatrix();
+            GlStateManager.disableLighting();
+            GlStateManager.pushAttrib();
+            RenderHelper.enableStandardItemLighting();
+            Minecraft.getMinecraft().getRenderItem().renderItem(stack, TransformType.FIXED);
+            RenderHelper.disableStandardItemLighting();
+            GlStateManager.popAttrib();
+            GlStateManager.enableLighting();
+            GlStateManager.popMatrix();
+        }
     }
 
     @SideOnly(Side.CLIENT)