summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2015-04-19 14:41:35 +0200
committerMattes D <github@xoft.cz>2015-04-19 14:41:35 +0200
commit3b49a1d250f30c9028213f7c4100bf781a628c0c (patch)
treee1625d057b43638befdd56e74c082c05571b33d2 /src
parentMerge pull request #1876 from jammet/patch-1 (diff)
parentRecipes match zero DamageValue strictly. (diff)
downloadcuberite-3b49a1d250f30c9028213f7c4100bf781a628c0c.tar
cuberite-3b49a1d250f30c9028213f7c4100bf781a628c0c.tar.gz
cuberite-3b49a1d250f30c9028213f7c4100bf781a628c0c.tar.bz2
cuberite-3b49a1d250f30c9028213f7c4100bf781a628c0c.tar.lz
cuberite-3b49a1d250f30c9028213f7c4100bf781a628c0c.tar.xz
cuberite-3b49a1d250f30c9028213f7c4100bf781a628c0c.tar.zst
cuberite-3b49a1d250f30c9028213f7c4100bf781a628c0c.zip
Diffstat (limited to '')
-rw-r--r--src/CraftingRecipes.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/CraftingRecipes.cpp b/src/CraftingRecipes.cpp
index cf8982afb..472044fa3 100644
--- a/src/CraftingRecipes.cpp
+++ b/src/CraftingRecipes.cpp
@@ -673,10 +673,10 @@ cCraftingRecipes::cRecipe * cCraftingRecipes::MatchRecipe(const cItem * a_Crafti
if (
(itrS->x >= a_GridWidth) ||
(itrS->y >= a_GridHeight) ||
- (Item.m_ItemType != a_CraftingGrid[GridID].m_ItemType) || // same item type?
+ (Item.m_ItemType != a_CraftingGrid[GridID].m_ItemType) || // same item type?
(Item.m_ItemCount > a_CraftingGrid[GridID].m_ItemCount) || // not enough items
(
- (Item.m_ItemDamage > 0) && // should compare damage values?
+ (Item.m_ItemDamage >= 0) && // should compare damage values?
(Item.m_ItemDamage != a_CraftingGrid[GridID].m_ItemDamage)
)
)