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

Merge pull request #1478 from yueh/fix-1465

Browse source 
Fixes #1465 faulty item comparison
This commit is contained in:
yueh 2015-05-19 00:53:53 +02:00
commit ecf2f3fdaf
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 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 @Override

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

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

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

@ -1859,15 +1859,15 @@ public class Platform
return null; 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 true;
} }
return ol.getItemDamage() == ol.getItemDamage(); return that.getItemDamage() == other.getItemDamage();
} }
return false; return false;
} }