summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2015-05-31 22:16:34 +0200
committerMattes D <github@xoft.cz>2015-05-31 22:16:34 +0200
commit4f086b37d285592159fbf9f287c7a3685b55311a (patch)
tree14b6adb90cb893c0619eab3bfc62d5a851d9d3a2
parentManualBindings: Fixed DoWithXYZ and ForEachInChunk signatures. (diff)
parentFixed crafting recipe matching. (diff)
downloadcuberite-4f086b37d285592159fbf9f287c7a3685b55311a.tar
cuberite-4f086b37d285592159fbf9f287c7a3685b55311a.tar.gz
cuberite-4f086b37d285592159fbf9f287c7a3685b55311a.tar.bz2
cuberite-4f086b37d285592159fbf9f287c7a3685b55311a.tar.lz
cuberite-4f086b37d285592159fbf9f287c7a3685b55311a.tar.xz
cuberite-4f086b37d285592159fbf9f287c7a3685b55311a.tar.zst
cuberite-4f086b37d285592159fbf9f287c7a3685b55311a.zip
-rw-r--r--src/CraftingRecipes.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/CraftingRecipes.cpp b/src/CraftingRecipes.cpp
index 755b152b0..a95ac5f84 100644
--- a/src/CraftingRecipes.cpp
+++ b/src/CraftingRecipes.cpp
@@ -771,9 +771,12 @@ cCraftingRecipes::cRecipe * cCraftingRecipes::MatchRecipe(const cItem * a_Crafti
continue;
}
Recipe->m_Ingredients.push_back(*itrS);
+ Recipe->m_Ingredients.back().x += a_OffsetX;
+ Recipe->m_Ingredients.back().y += a_OffsetY;
}
Recipe->m_Ingredients.insert(Recipe->m_Ingredients.end(), MatchedSlots.begin(), MatchedSlots.end());
+ // Handle the fireworks-related effects:
// We use Recipe instead of a_Recipe because we want the wildcard ingredients' slot numbers as well, which was just added previously
HandleFireworks(a_CraftingGrid, Recipe.get(), a_GridStride, a_OffsetX, a_OffsetY);