summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlexander Harkness <me@bearbin.net>2015-06-07 15:43:16 +0200
committerAlexander Harkness <me@bearbin.net>2015-06-07 15:43:16 +0200
commitf1a3535d6e97b6a703e0685111606ea2b9e66489 (patch)
treecab65bdfa645859151a9c92bd121dfdc0301bb74 /src
parentMerge pull request #2211 from jan64/master (diff)
parentFixed style (diff)
downloadcuberite-f1a3535d6e97b6a703e0685111606ea2b9e66489.tar
cuberite-f1a3535d6e97b6a703e0685111606ea2b9e66489.tar.gz
cuberite-f1a3535d6e97b6a703e0685111606ea2b9e66489.tar.bz2
cuberite-f1a3535d6e97b6a703e0685111606ea2b9e66489.tar.lz
cuberite-f1a3535d6e97b6a703e0685111606ea2b9e66489.tar.xz
cuberite-f1a3535d6e97b6a703e0685111606ea2b9e66489.tar.zst
cuberite-f1a3535d6e97b6a703e0685111606ea2b9e66489.zip
Diffstat (limited to 'src')
-rw-r--r--src/CraftingRecipes.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/CraftingRecipes.cpp b/src/CraftingRecipes.cpp
index a95ac5f84..c6a407d4b 100644
--- a/src/CraftingRecipes.cpp
+++ b/src/CraftingRecipes.cpp
@@ -168,7 +168,14 @@ void cCraftingGrid::ConsumeGrid(const cCraftingGrid & a_Grid)
m_Items[ThisIdx].m_ItemCount -= NumWantedItems;
if (m_Items[ThisIdx].m_ItemCount == 0)
{
- m_Items[ThisIdx].Clear();
+ if ((m_Items[ThisIdx].m_ItemType == E_ITEM_MILK) || (m_Items[ThisIdx].m_ItemType == E_ITEM_WATER_BUCKET) || (m_Items[ThisIdx].m_ItemType == E_ITEM_LAVA_BUCKET))
+ {
+ m_Items[ThisIdx] = cItem(E_ITEM_BUCKET, m_Items[ThisIdx].m_ItemCount);
+ }
+ else
+ {
+ m_Items[ThisIdx].Clear();
+ }
}
} // for x, for y
}