Skip to content

Commit bbe3ca9

Browse files
authored
Merge pull request #33 from repo-alt/rv3-1.7.10
some random null checks
2 parents 05c3b09 + 6aefa4f commit bbe3ca9

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
aeversion=rv3
22
aechannel=beta
3-
aebuild=38-GTNH
3+
aebuild=39-GTNH
44
#KEEP V6 FOR MOD SUPPORT
55
aegroup=appeng
66
aebasename=appliedenergistics2

src/main/java/appeng/container/implementations/ContainerCraftConfirm.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,8 @@ public void detectAndSendChanges()
133133
{
134134
return;
135135
}
136+
if (getGrid() == null)
137+
return;
136138

137139
final ICraftingGrid cc = this.getGrid().getCache( ICraftingGrid.class );
138140
final ImmutableSet<ICraftingCPU> cpuSet = cc.getCpus();
@@ -291,6 +293,8 @@ public void detectAndSendChanges()
291293
private IGrid getGrid()
292294
{
293295
final IActionHost h = ( (IActionHost) this.getTarget() );
296+
if (h == null || h.getActionableNode() == null)
297+
return null;
294298
return h.getActionableNode().getGrid();
295299
}
296300

@@ -348,7 +352,7 @@ public void startJob()
348352
originalGui = GuiBridge.GUI_PATTERN_TERMINAL_EX;
349353
}
350354

351-
if( this.result != null && !this.isSimulation() )
355+
if( this.result != null && !this.isSimulation() && getGrid() != null)
352356
{
353357
final ICraftingGrid cc = this.getGrid().getCache( ICraftingGrid.class );
354358
final ICraftingLink g = cc.submitJob( this.result, null, this.getSelectedCpu() == -1 ? null : this.cpus.get( this.getSelectedCpu() ).getCpu(), true, this.getActionSrc() );

0 commit comments

Comments
 (0)