diff options
| author | Bass <tudurap.com@gmail.com> | 2019-12-04 18:25:54 +0000 |
|---|---|---|
| committer | Bass <tudurap.com@gmail.com> | 2019-12-04 18:25:54 +0000 |
| commit | 767132b3d97b85e22f86415ca1b12ba6f6b83e37 (patch) | |
| tree | c0398dde667c100c86e493f52cd762e7c41289d7 /src/main/java/com | |
| parent | 0bd5ec684f6974109d7c520471bd196f482d92ca (diff) | |
| parent | 236f3bb80f1349c15cd107ea2bf1ae7ebddf9e7a (diff) | |
| download | GT5-Unofficial-767132b3d97b85e22f86415ca1b12ba6f6b83e37.tar.gz GT5-Unofficial-767132b3d97b85e22f86415ca1b12ba6f6b83e37.tar.bz2 GT5-Unofficial-767132b3d97b85e22f86415ca1b12ba6f6b83e37.zip | |
Merge remote-tracking branch 'origin/BassAddons' into BassAddons
Diffstat (limited to 'src/main/java/com')
| -rw-r--r-- | src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java | 10 |
1 files changed, 7 insertions, 3 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 6fe6b164e1..93111e1f60 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 @@ -139,8 +139,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(); } } @@ -556,4 +560,4 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB public String[] getStructureDescription(int stackSize) { return description; } -}
\ No newline at end of file +} |