diff options
| author | Jakub <53441451+kuba6000@users.noreply.github.com> | 2022-03-20 01:20:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-20 01:20:09 +0100 |
| commit | fbe26eea1b365672883f4ac7945eb45f25e64dde (patch) | |
| tree | d3588606cb86cbf01d5eafedc1c4571df9dba117 /src/main | |
| parent | ada57aa08f5f233c0923a7290747c7f63d331587 (diff) | |
| download | GT5-Unofficial-fbe26eea1b365672883f4ac7945eb45f25e64dde.tar.gz GT5-Unofficial-fbe26eea1b365672883f4ac7945eb45f25e64dde.tar.bz2 GT5-Unofficial-fbe26eea1b365672883f4ac7945eb45f25e64dde.zip | |
Dont override material when it cant be found (#112)
Former-commit-id: 8a5a24d697a34f8a7c8984965b1997b5cbbc4613
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/StaticRecipeChangeLoaders.java | 4 |
1 files changed, 2 insertions, 2 deletions
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()); |