From 4a2fa070a2ae91173cf15785c63b4090016323d4 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Fri, 11 Oct 2019 18:14:07 +0100
Subject: $ Fixed many tiny bugs, found by static code analysis. $ Fixed
 Canning handling further. $ Adjusted the Charcoal Pit fix.

---
 src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Java/gtPlusPlus/core/block')

diff --git a/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java b/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java
index 8310fa3c23..c0113e869b 100644
--- a/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java
+++ b/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java
@@ -175,7 +175,7 @@ public class BlockBaseModular extends BasicBlock {
 				}
 			}		
 			metType = (metType.equals("9j4852jyo3rjmh3owlhw9oe") ? "METALLIC" : metType);	
-			int tier = this.blockMaterial.vTier;
+			int tier = blockMaterial != null ? this.blockMaterial.vTier : 0;
 			String aType = (this.thisBlock == BlockTypes.FRAME) ? "frameGt" : (tier <= 4 ? "block1" : "block5");			
 			this.blockIcon = iIcon.registerIcon("gregtech" + ":" + "materialicons/"+ metType +"/" + aType);
 	}
-- 
cgit