From 129558bd98e76cc0491f4103bf6b985fad0aeb95 Mon Sep 17 00:00:00 2001
From: Chicken-Bones <mehvids@gmail.com>
Date: Fri, 2 May 2014 12:37:23 +1000
Subject: [PATCH] Fix crash with mods calling loadTextureMap in postInit

---
 src/codechicken/microblock/MicroMaterialRegistry.scala         | 3 ++-
 .../microblock/handler/MicroblockEventHandler.scala            | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/codechicken/microblock/MicroMaterialRegistry.scala b/src/codechicken/microblock/MicroMaterialRegistry.scala
index e04e778..eccc9b7 100644
--- a/src/codechicken/microblock/MicroMaterialRegistry.scala
+++ b/src/codechicken/microblock/MicroMaterialRegistry.scala
@@ -174,7 +174,8 @@ object MicroMaterialRegistry
     }
 
     private[microblock] def loadIcons() {
-        MicroMaterialRegistry.getIdMap.foreach(e => e._2.loadIcons())
+        if(idMap != null)
+            idMap.foreach(e => e._2.loadIcons())
     }
 
     def getMaxCuttingStrength = maxCuttingStrength
diff --git a/src/codechicken/microblock/handler/MicroblockEventHandler.scala b/src/codechicken/microblock/handler/MicroblockEventHandler.scala
index 6aabaa6..1649265 100644
--- a/src/codechicken/microblock/handler/MicroblockEventHandler.scala
+++ b/src/codechicken/microblock/handler/MicroblockEventHandler.scala
@@ -19,7 +19,7 @@ object MicroblockEventHandler
     @SideOnly(Side.CLIENT)
     def postTextureStitch(event:TextureStitchEvent.Post)
     {
-        if(event.map.getTextureType == 0 && Loader.instance.hasReachedState(LoaderState.POSTINITIALIZATION))
+        if(event.map.getTextureType == 0)
             MicroMaterialRegistry.loadIcons()
     }