diff options
| author | Martin Robertz <dream-master@gmx.net> | 2018-04-01 03:38:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-01 03:38:29 +0200 |
| commit | 1b92fc20b10c73c566c60b582820aa03202e4419 (patch) | |
| tree | f1b8bebf9991a026dfc07c1f5f4e1233fb6c0631 /src/main/java/gregtech/common | |
| parent | 921bf4bf8eabb643764f74eaf5f181b58c8c0baf (diff) | |
| parent | 340becf9fb1078466974f7d7650f86280e234bb9 (diff) | |
| download | GT5-Unofficial-1b92fc20b10c73c566c60b582820aa03202e4419.tar.gz GT5-Unofficial-1b92fc20b10c73c566c60b582820aa03202e4419.tar.bz2 GT5-Unofficial-1b92fc20b10c73c566c60b582820aa03202e4419.zip | |
Merge pull request #111 from codewarrior0/patch-6
Fix crash when using Scanner/InfoPanel on empty Processing Array
Diffstat (limited to 'src/main/java/gregtech/common')
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java index 82293cff0a..35b2dcc68e 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java @@ -427,7 +427,7 @@ public class GT_MetaTileEntity_ProcessingArray extends GT_MetaTileEntity_MultiBl EnumChatFormatting.GREEN+tTier+EnumChatFormatting.RESET+ " Discount: "+ EnumChatFormatting.GREEN+(1<<mMult)+EnumChatFormatting.RESET + " x", - "Parallel processing: "+EnumChatFormatting.GREEN+(mInventory[1].stackSize<<mMult)+EnumChatFormatting.RESET + "Parallel processing: "+EnumChatFormatting.GREEN+((mInventory[1] != null) ? (mInventory[1].stackSize<<mMult) : 0)+EnumChatFormatting.RESET }; } |