From fbe26eea1b365672883f4ac7945eb45f25e64dde Mon Sep 17 00:00:00 2001
From: Jakub <53441451+kuba6000@users.noreply.github.com>
Date: Sun, 20 Mar 2022 01:20:09 +0100
Subject: Dont override material when it cant be found (#112)

Former-commit-id: 8a5a24d697a34f8a7c8984965b1997b5cbbc4613
---
 .../bartworks/common/loaders/StaticRecipeChangeLoaders.java           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/StaticRecipeChangeLoaders.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/StaticRecipeChangeLoaders.java
index 684149c9f6..6282852d58 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/StaticRecipeChangeLoaders.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/StaticRecipeChangeLoaders.java
@@ -246,7 +246,7 @@ public class StaticRecipeChangeLoaders {
 
     private static void runUnficationDeleter(Werkstoff werkstoff) {
         if (werkstoff.getType() == Werkstoff.Types.ELEMENT) {
-            if (werkstoff.getBridgeMaterial() != null) {
+            if (werkstoff.getBridgeMaterial() != null && Element.get(werkstoff.getToolTip()) != Element._NULL) {
                 werkstoff.getBridgeMaterial().mElement = Element.get(werkstoff.getToolTip());
                 Element.get(werkstoff.getToolTip()).mLinkedMaterials = new ArrayList<>();
                 Element.get(werkstoff.getToolTip()).mLinkedMaterials.add(werkstoff.getBridgeMaterial());
@@ -265,7 +265,7 @@ public class StaticRecipeChangeLoaders {
 
     private static void runMaterialLinker(Werkstoff werkstoff) {
         if (werkstoff.getType() == Werkstoff.Types.ELEMENT) {
-            if (werkstoff.getBridgeMaterial() != null) {
+            if (werkstoff.getBridgeMaterial() != null && Element.get(werkstoff.getToolTip()) != Element._NULL) {
                 werkstoff.getBridgeMaterial().mElement = Element.get(werkstoff.getToolTip());
                 Element.get(werkstoff.getToolTip()).mLinkedMaterials = new ArrayList<>();
                 Element.get(werkstoff.getToolTip()).mLinkedMaterials.add(werkstoff.getBridgeMaterial());
-- 
cgit