aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>2019-01-12 07:33:38 +0100
committerbartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>2019-01-12 07:33:38 +0100
commit52a935e46e0e9f9a5249efdeff8ee6514d5c144e (patch)
tree897b8a589179e6d7d81061a568a2183bf01aa2c8 /src
parent299823db1caa4c3343b3f601f9a63bbd3baee060 (diff)
downloadGT5-Unofficial-52a935e46e0e9f9a5249efdeff8ee6514d5c144e.tar.gz
GT5-Unofficial-52a935e46e0e9f9a5249efdeff8ee6514d5c144e.tar.bz2
GT5-Unofficial-52a935e46e0e9f9a5249efdeff8ee6514d5c144e.zip
version splittage
+the mod version now consists of 3 subversions +fixed another NPE Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/server/container/GT_Container_CircuitProgrammer.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/server/container/GT_Container_CircuitProgrammer.java b/src/main/java/com/github/bartimaeusnek/bartworks/server/container/GT_Container_CircuitProgrammer.java
index 9f0254bd62..f52d3e8b63 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/server/container/GT_Container_CircuitProgrammer.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/server/container/GT_Container_CircuitProgrammer.java
@@ -83,7 +83,7 @@ public class GT_Container_CircuitProgrammer extends Container {
Slot chipslot = (Slot) this.inventorySlots.get(0);
if (SlotNR > 24) {
Slot slot = (Slot) this.inventorySlots.get(SlotNR);
- if (slot != null && slot.getStack().getItem().equals(GT_Utility.getIntegratedCircuit(0).getItem())) {
+ if (slot != null && slot.getStack() != null && slot.getStack().getItem().equals(GT_Utility.getIntegratedCircuit(0).getItem())) {
if (chipslot.getStack() == null) {
chipslot.putStack(slot.getStack());
slot.decrStackSize(1);