From 330ff68dafde0480a318870f9a7f7b73a8032eb4 Mon Sep 17 00:00:00 2001
From: Tec <daniel112092@gmail.com>
Date: Wed, 4 Dec 2019 18:19:55 +0100
Subject: Just in case add null checc

---
 .../thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/main/java')

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();
             }
         }
-- 
cgit