diff options
| author | Tec <daniel112092@gmail.com> | 2019-12-04 18:19:55 +0100 |
|---|---|---|
| committer | Tec <daniel112092@gmail.com> | 2019-12-04 18:19:55 +0100 |
| commit | 330ff68dafde0480a318870f9a7f7b73a8032eb4 (patch) | |
| tree | 55f47d5154678c1ea709bf7b7646cb590651eca8 /src/main/java | |
| parent | 704829e835e6ec5572b6bbeacbeaae2a2baee8dc (diff) | |
| download | GT5-Unofficial-330ff68dafde0480a318870f9a7f7b73a8032eb4.tar.gz GT5-Unofficial-330ff68dafde0480a318870f9a7f7b73a8032eb4.tar.bz2 GT5-Unofficial-330ff68dafde0480a318870f9a7f7b73a8032eb4.zip | |
Just in case add null checc
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java index 11be32f9a5..0c37246de8 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java @@ -305,8 +305,12 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB private void makeStick2(){ String s = tRecipe.mOutput.getDisplayName(); if (getBaseMetaTileEntity().isServerSide()) { - s = lServerNames.get(tRecipe.mOutput.getDisplayName()); - if (s==null) { + if(lServerNames!=null) { + s = lServerNames.get(tRecipe.mOutput.getDisplayName()); + if (s == null) { + s = tRecipe.mOutput.getDisplayName(); + } + }else{ s = tRecipe.mOutput.getDisplayName(); } } |