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

Fixes #1465 faulty item comparison

This commit is contained in:
yueh 2015-05-18 17:52:56 +02:00 committed by thatsIch
parent ca50ee0762
commit 6e7100361c
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/appeng/core/features/WrappedDamageItemDefinition.java
View File

@ -85,7 +85,10 @@ public final class WrappedDamageItemDefinition implements ITileDefinition
return false;
}
return this.definition.isSameAs( comparableStack ) && comparableStack.getItemDamage() == this.damage;
final boolean sameItem = this.definition.isSameAs( new ItemStack( comparableStack.getItem() ) );
final boolean sameDamage = comparableStack.getItemDamage() == this.damage;
return sameItem && sameDamage;
}
@Override

2
src/main/java/appeng/recipes/game/DisassembleRecipe.java
View File

@ -92,7 +92,7 @@ public final class DisassembleRecipe implements IRecipe
{
// needs a single input in the recipe
itemCount++;
if ( itemCount > 1 )
if( itemCount > 1 )
{
return MISMATCHED_STACK;
}

8
src/main/java/appeng/util/Platform.java
View File

@ -1863,15 +1863,15 @@ public class Platform
return null;
}
public static boolean isSameItemType( ItemStack ol, ItemStack op )
public static boolean isSameItemType( ItemStack that, ItemStack other )
{
if( ol != null && op != null && ol.getItem() == op.getItem() )
if( that != null && other != null && that.getItem() == other.getItem() )
{
if( ol.isItemStackDamageable() )
if( that.isItemStackDamageable() )
{
return true;
}
return ol.getItemDamage() == ol.getItemDamage();
return that.getItemDamage() == other.getItemDamage();
}
return false;
}