diff options
| author | RecursivePineapple <recursive_pineapple@proton.me> | 2024-09-28 07:56:06 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-28 11:56:06 +0000 |
| commit | ac33966e683ca91354feb3b719070ea9ef0a2c70 (patch) | |
| tree | 964ba2e40261f5fdc9a1ce122cbf52980c6945de /src/main | |
| parent | 85334d73e27a3bb9eb32daf28a7dd7bed34331f6 (diff) | |
| download | GT5-Unofficial-ac33966e683ca91354feb3b719070ea9ef0a2c70.tar.gz GT5-Unofficial-ac33966e683ca91354feb3b719070ea9ef0a2c70.tar.bz2 GT5-Unofficial-ac33966e683ca91354feb3b719070ea9ef0a2c70.zip | |
Fixed NPE when holding a frame w/ missing material (#3294)
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/gregtech/common/blocks/ItemFrames.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/java/gregtech/common/blocks/ItemFrames.java b/src/main/java/gregtech/common/blocks/ItemFrames.java index daa6ca2d2e..ef40c21928 100644 --- a/src/main/java/gregtech/common/blocks/ItemFrames.java +++ b/src/main/java/gregtech/common/blocks/ItemFrames.java @@ -44,6 +44,7 @@ public class ItemFrames extends ItemBlock { public int getColorFromItemStack(ItemStack aStack, int aPass) { int meta = aStack.getItemDamage(); Materials material = BlockFrameBox.getMaterial(meta); + if (material == null) return 0; return (material.mRGBa[0] << 16) | (material.mRGBa[1] << 8) | material.mRGBa[2]; } |