fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 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
parent f3db010303 7fa7502770
commit ecf2f3fdaf
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/util/Platform.java
+4 -4
View File
@@ -1859,15 +1859,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;
}