AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-24 04:50:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7

Browse Source 
Conflicts:
	src/main/scala/li/cil/oc/util/ItemCosts.scala
This commit is contained in:
Florian Nücke 2014-07-04 23:27:38 +02:00
commit 9e59bda886
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/scala/li/cil/oc/util/ItemCosts.scala
View File

@ -131,9 +131,11 @@ object ItemCosts {
// for example by components being assigned an address, which will break the
// equals check.
private def fuzzyEquals(stack1: ItemStack, stack2: ItemStack) =
stack1.getItem == stack2.getItem &&
stack1 == stack2 || (stack1 != null && stack2 != null &&
stack1.getItem == stack2.getItem &&
(stack1.getItemDamage == stack2.getItemDamage ||
stack1.getItemDamage == OreDictionary.WILDCARD_VALUE ||
stack2.getItemDamage == OreDictionary.WILDCARD_VALUE ||
stack1.getItem.isDamageable) // && ItemStack.areItemStackTagsEqual(stack1, stack2)
)
}