aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorbartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>2019-12-24 22:05:53 +0100
committerbartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>2019-12-24 22:05:53 +0100
commit12a54a5f202ef11c6d96f7a627b48c19482a8978 (patch)
tree6d993cecea51eeab7b0190409a5d97ce6972dac9 /src/main
parent3f6b776f96e99ebd5ffd830b0dfc0206d3429409 (diff)
downloadGT5-Unofficial-12a54a5f202ef11c6d96f7a627b48c19482a8978.tar.gz
GT5-Unofficial-12a54a5f202ef11c6d96f7a627b48c19482a8978.tar.bz2
GT5-Unofficial-12a54a5f202ef11c6d96f7a627b48c19482a8978.zip
Fixed Unification enforcement handler
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 9504e9c6269c910c43f335ba728205dae717a196
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaVacuumFreezer.java3
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/server/EventHandler/ServerEventHandler.java12
2 files changed, 11 insertions, 4 deletions
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;
}
}