From 12a54a5f202ef11c6d96f7a627b48c19482a8978 Mon Sep 17 00:00:00 2001
From: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
Date: Tue, 24 Dec 2019 22:05:53 +0100
Subject: Fixed Unification enforcement handler

Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>

Former-commit-id: 9504e9c6269c910c43f335ba728205dae717a196
---
 .../multis/mega/GT_TileEntity_MegaVacuumFreezer.java         |  3 +--
 .../bartworks/server/EventHandler/ServerEventHandler.java    | 12 ++++++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaVacuumFreezer.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaVacuumFreezer.java
index ce628ce003..1a3e1ca7bb 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaVacuumFreezer.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaVacuumFreezer.java
@@ -151,5 +151,4 @@ public class GT_TileEntity_MegaVacuumFreezer extends GT_MetaTileEntity_VacuumFre
                 ) && !this.mInputBusses.isEmpty() && !this.mOutputBusses.isEmpty() && !this.mEnergyHatches.isEmpty() && !this.mMaintenanceHatches.isEmpty();
     }
 
-
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/server/EventHandler/ServerEventHandler.java b/src/main/java/com/github/bartimaeusnek/bartworks/server/EventHandler/ServerEventHandler.java
index bb7c343eee..59b8b947b7 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/server/EventHandler/ServerEventHandler.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/server/EventHandler/ServerEventHandler.java
@@ -74,13 +74,21 @@ public class ServerEventHandler {
                        if (replace) {
                            if (oreDictName.contains(e.getVarName())) {
                                String prefix = oreDictName.replace(e.getVarName(), "");
-                               toReplace = GT_OreDictUnificator.get(OrePrefixes.getPrefix(prefix), e.getVarName(), stack.stackSize);
+                               OrePrefixes prefixes = OrePrefixes.getPrefix(prefix);
+                               if (prefixes == null) {
+                                   continue;
+                               }
+                               toReplace = GT_OreDictUnificator.get(prefixes, e.getVarName(), stack.stackSize);
                                break loop;
                            } else {
                                for (String s : e.getADDITIONAL_OREDICT()) {
                                    if (oreDictName.contains(s)) {
                                        String prefix = oreDictName.replace(s, "");
-                                       toReplace = GT_OreDictUnificator.get(OrePrefixes.getPrefix(prefix), e.getVarName(), stack.stackSize);
+                                       OrePrefixes prefixes = OrePrefixes.getPrefix(prefix);
+                                       if (prefixes == null) {
+                                           continue;
+                                       }
+                                       toReplace = GT_OreDictUnificator.get(prefixes, e.getVarName(), stack.stackSize);
                                        break loop;
                                    }
                                }
-- 
cgit