diff options
author | teddydestodes <derkomtur@schattengang.net> | 2011-06-01 14:11:52 +0200 |
---|---|---|
committer | teddydestodes <derkomtur@schattengang.net> | 2011-06-01 14:11:52 +0200 |
commit | 4ddf2bc8a2531e158d63e92325319f21bea9278d (patch) | |
tree | 1a28b7a0b2b454354f2dfdab278b51b0cc741f28 /src/server.cpp | |
parent | 9de57d13bc7a97fba17da5807e1ef57d96586deb (diff) | |
parent | 5f52a622b6a2602742ea472c1163eba2acf17fb6 (diff) | |
download | minetest-4ddf2bc8a2531e158d63e92325319f21bea9278d.tar.gz minetest-4ddf2bc8a2531e158d63e92325319f21bea9278d.tar.bz2 minetest-4ddf2bc8a2531e158d63e92325319f21bea9278d.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/server.cpp')
-rw-r--r-- | src/server.cpp | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/src/server.cpp b/src/server.cpp index c7b64f413..17850c5fa 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -3987,6 +3987,36 @@ void Server::UpdateCrafting(u16 peer_id) found = true; } } + + // Clay + if(!found) + { + ItemSpec specs[9]; + specs[3] = ItemSpec(ITEM_CRAFT, "lump_of_clay"); + specs[4] = ItemSpec(ITEM_CRAFT, "lump_of_clay"); + specs[6] = ItemSpec(ITEM_CRAFT, "lump_of_clay"); + specs[7] = ItemSpec(ITEM_CRAFT, "lump_of_clay"); + if(checkItemCombination(items, specs)) + { + rlist->addItem(new MaterialItem(CONTENT_CLAY, 1)); + found = true; + } + } + + // Brick + if(!found) + { + ItemSpec specs[9]; + specs[3] = ItemSpec(ITEM_CRAFT, "clay_brick"); + specs[4] = ItemSpec(ITEM_CRAFT, "clay_brick"); + specs[6] = ItemSpec(ITEM_CRAFT, "clay_brick"); + specs[7] = ItemSpec(ITEM_CRAFT, "clay_brick"); + if(checkItemCombination(items, specs)) + { + rlist->addItem(new MaterialItem(CONTENT_BRICK, 1)); + found = true; + } + } } } // if creative_mode == false @@ -4076,8 +4106,11 @@ void setCreativeInventory(Player *player) CONTENT_STONE, CONTENT_SAND, CONTENT_SANDSTONE, + CONTENT_CLAY, + CONTENT_BRICK, CONTENT_TREE, CONTENT_LEAVES, + CONTENT_CACTUS, CONTENT_GLASS, CONTENT_FENCE, CONTENT_MESE, |