diff options
| author | Martin Robertz <dream-master@gmx.net> | 2019-02-08 18:30:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-08 18:30:22 +0100 |
| commit | da69eb938e9bb110499dd29a6228bc095b57e1ef (patch) | |
| tree | 833b2fb4b129ac251bbc22ff8f51bb67901abc29 /src/main/java/gregtech/api/util | |
| parent | deb54fffe7ffd48063713f15cd4503916f3b2c39 (diff) | |
| parent | 3733c1445d9379bea6da6bf759fa349c9e58757e (diff) | |
| download | GT5-Unofficial-da69eb938e9bb110499dd29a6228bc095b57e1ef.tar.gz GT5-Unofficial-da69eb938e9bb110499dd29a6228bc095b57e1ef.tar.bz2 GT5-Unofficial-da69eb938e9bb110499dd29a6228bc095b57e1ef.zip | |
Merge pull request #172 from GTNewHorizons/bmf2
fixed NPE related to custom materials,
Diffstat (limited to 'src/main/java/gregtech/api/util')
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_Assemblyline_Server.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/main/java/gregtech/api/util/GT_Assemblyline_Server.java b/src/main/java/gregtech/api/util/GT_Assemblyline_Server.java index 0374f221a8..d8fae1917e 100644 --- a/src/main/java/gregtech/api/util/GT_Assemblyline_Server.java +++ b/src/main/java/gregtech/api/util/GT_Assemblyline_Server.java @@ -50,7 +50,10 @@ public class GT_Assemblyline_Server { if (entry.getKey().contains("name")) { int i = Integer.parseInt(entry.getKey().substring("gt.metaitem.01.".length(), entry.getKey().length()-".name".length())); i=i%1000; - lServerNames.put(entry.getKey(), entry.getValue().replace("material",GregTech_API.sGeneratedMaterials[i].toString())); + if (GregTech_API.sGeneratedMaterials[i] != null) + lServerNames.put(entry.getKey(), entry.getValue().replace("material",GregTech_API.sGeneratedMaterials[i].toString())); + else + lServerNames.put(entry.getKey(), null); } } for (Map.Entry<String, String> entry : internal3.entrySet()) { @@ -67,7 +70,7 @@ public class GT_Assemblyline_Server { !entry.getKey().contains("_small")&& !entry.getKey().contains("_tiny") ) - lServerNames.put(entry.getKey(), entry.getValue().replace("material", entry.getKey().substring("gt.blockmachines.gt_pipe_".length(), entry.getKey().length()-".name".length()))); + lServerNames.put(entry.getKey(), entry.getValue().replace("material", entry.getKey().substring("gt.blockmachines.gt_pipe_".length(), entry.getKey().length()-".name".length()))); else if (entry.getKey().contains("_huge")||entry.getKey().contains("_tiny")) lServerNames.put(entry.getKey(), entry.getValue().replace("material", entry.getKey().substring("gt.blockmachines.gt_pipe_".length(), entry.getKey().length()-"_tiny.name".length()))); else if (entry.getKey().contains("_large")||entry.getKey().contains("_small")) @@ -86,7 +89,10 @@ public class GT_Assemblyline_Server { if (entry.getKey().contains("blockores")) { int i = Integer.parseInt(entry.getKey().substring("gt.blockores.".length(), entry.getKey().length()-".name".length())); i=i%1000; - lServerNames.put(entry.getKey(), entry.getValue().replace("material",GregTech_API.sGeneratedMaterials[i].toString())); + if (GregTech_API.sGeneratedMaterials[i] != null) + lServerNames.put(entry.getKey(), entry.getValue().replace("material",GregTech_API.sGeneratedMaterials[i].toString())); + else + lServerNames.put(entry.getKey(), null); } else if(entry.getKey().contains("blockmetal")) { Materials[] mMats = null; |