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

Fixed Anti-Recursive Crafting Check

Browse source
This commit is contained in:
AlgorithmX2 2014-07-12 18:13:40 -05:00
parent 91051183ad
commit 98e4604690
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
crafting/CraftingTreeNode.java
View file

@ -49,7 +49,7 @@ public class CraftingTreeNode
for (ICraftingPatternDetails details : cc.getCraftingFor( what ))// in order.
{
if ( notRecurive( details ) )
if ( parent == null || parent.notRecurive( details ) )
nodes.add( new CraftingTreeProcess( cc, job, details, this, depth + 1, world ) );
}
}
@ -63,13 +63,18 @@ public class CraftingTreeNode
boolean notRecurive(ICraftingPatternDetails details)
{
IAEItemStack[] o = details.getOutputs();
IAEItemStack[] o = details.getCondencedOutputs();
for (IAEItemStack i : o)
if ( i.equals( what ) )
return true;
return false;
o = details.getCondencedInputs();
for (IAEItemStack i : o)
if ( i.equals( what ) )
return false;
if ( parent == null )
return false;
return true;
return parent.notRecurive( details );
}

2
crafting/CraftingTreeProcess.java
View file

@ -88,7 +88,7 @@ public class CraftingTreeProcess
public boolean notRecurive(ICraftingPatternDetails details)
{
return parent.notRecurive( details );
return parent == null || parent.notRecurive( details );
}
long getTimes(long remaining, long stackSize)