tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Merge branch 'rv1' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv2

Browse source
This commit is contained in:
AlgorithmX2 2014-08-27 23:22:29 -05:00
commit d2f2316adb
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
me/cluster/implementations/CraftingCPUCluster.java
View file

@ -276,6 +276,9 @@ public class CraftingCPUCluster implements IAECluster, ICraftingCPU
public void postCraftingStatusChange(IAEItemStack diff)
{
if ( getGrid() == null )
return;
CraftingGridCache sg = getGrid().getCache( ICraftingGrid.class );
if ( sg.interestManager.containsKey( diff ) )
@ -1071,7 +1074,15 @@ public class CraftingCPUCluster implements IAECluster, ICraftingCPU
public boolean isActive()
{
return getCore().getActionableNode().isActive();
TileCraftingTile core = getCore();
if ( core == null )
return false;
IGridNode node = core.getActionableNode();
if ( node == null )
return false;
return node.isActive();
}
public boolean isMaking(IAEItemStack what)