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

Fixed MA Crash with processing Patterns.

Browse source
This commit is contained in:
AlgorithmX2 2014-07-12 17:14:28 -05:00
parent 0045287112
commit 8f65aad67b
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tile/crafting/TileMolecularAssembler.java
View file

@ -85,7 +85,7 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IAEAppEn
for (int x = 0; x < inv.getSizeInventory(); x++)
isEmpty = inv.getStackInSlot( x ) == null && isEmpty;
if ( isEmpty )
if ( isEmpty && patternDetails.isCraftable() )
{
forcePlan = true;
myPlan = patternDetails;
@ -119,9 +119,12 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IAEAppEn
ItemEncodedPattern iep = (ItemEncodedPattern) is.getItem();
ICraftingPatternDetails ph = iep.getPatternForItem( is, w );
progress = 0;
myPattern = is;
myPlan = ph;
if ( ph.isCraftable() )
{
progress = 0;
myPattern = is;
myPlan = ph;
}
}
}
else
@ -223,7 +226,7 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IAEAppEn
World w = getWorldObj();
ItemEncodedPattern iep = (ItemEncodedPattern) myPat.getItem();
ICraftingPatternDetails ph = iep.getPatternForItem( myPat, w );
if ( ph != null )
if ( ph != null && ph.isCraftable() )
{
forcePlan = true;
myPlan = ph;

2
util/item/AEItemStack.java
View file

@ -113,7 +113,7 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
{
if ( ia instanceof AEItemStack )
{
return ((AEItemStack) ia).def.equals( def ) && def.tagCompound == ((AEItemStack) ia).def.tagCompound;
return ((AEItemStack) ia).def.equals( def );// && def.tagCompound == ((AEItemStack) ia).def.tagCompound;
}
else if ( ia instanceof ItemStack )
{