diff options
| author | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2019-10-11 18:14:07 +0100 |
|---|---|---|
| committer | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2019-10-11 18:14:07 +0100 |
| commit | 4a2fa070a2ae91173cf15785c63b4090016323d4 (patch) | |
| tree | 7a07b317b7b66778869f321da82f95dfee70107f /src/Java/gtPlusPlus/core/block | |
| parent | 8ca23d37495647bda859bc1821c2551cf8b21bf3 (diff) | |
| download | GT5-Unofficial-4a2fa070a2ae91173cf15785c63b4090016323d4.tar.gz GT5-Unofficial-4a2fa070a2ae91173cf15785c63b4090016323d4.tar.bz2 GT5-Unofficial-4a2fa070a2ae91173cf15785c63b4090016323d4.zip | |
$ Fixed many tiny bugs, found by static code analysis.
$ Fixed Canning handling further.
$ Adjusted the Charcoal Pit fix.
Diffstat (limited to 'src/Java/gtPlusPlus/core/block')
| -rw-r--r-- | src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java | 2 |
1 files changed, 1 insertions, 1 deletions
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); } |