diff options
| author | Martin Robertz <dream-master@gmx.net> | 2021-10-28 06:44:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-28 06:44:11 +0200 |
| commit | 74742dff2e46b22ad459cee87d4ccdf12d30008d (patch) | |
| tree | 2208aca4f1863f2c28a2063f40543779bfc7e0a3 | |
| parent | 194f9c2847e2fdc1dd8399e4b1a7a7cadaae6f37 (diff) | |
| parent | 83da93397278c1bd362c61412e5138ca571dc3b6 (diff) | |
| download | GT5-Unofficial-74742dff2e46b22ad459cee87d4ccdf12d30008d.tar.gz GT5-Unofficial-74742dff2e46b22ad459cee87d4ccdf12d30008d.tar.bz2 GT5-Unofficial-74742dff2e46b22ad459cee87d4ccdf12d30008d.zip | |
Merge pull request #48 from Alexdoru/master
fix crash #8594
Former-commit-id: 164e88b9f867fbae8e5218e776345ff5704791ee
| -rw-r--r-- | src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlock_Item.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlock_Item.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlock_Item.java index d612fa211a..cbde0f80e6 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlock_Item.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlock_Item.java @@ -58,11 +58,16 @@ public class BW_MetaGeneratedBlock_Item extends BW_ItemBlocks { @SideOnly(Side.CLIENT) @SuppressWarnings("unchecked") public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { - if (!GT_Utility.isStackValid(aStack) || aPlayer == null || aStack.getItemDamage() <= 0) + if (!GT_Utility.isStackValid(aStack) || aPlayer == null || aStack.getItemDamage() <= 0) { return; - if (aList == null) + } + if (aList == null) { aList = new ArrayList<String>(); - aList.add(Werkstoff.werkstoffHashMap.get((short) aStack.getItemDamage()).getToolTip()); + } + Werkstoff werkstoff = Werkstoff.werkstoffHashMap.get((short) aStack.getItemDamage()); + if(werkstoff != null) { + aList.add(werkstoff.getToolTip()); + } aList.add(BW_Tooltip_Reference.ADDED_BY_BARTWORKS.get()); } |