* better glass graphics

[minetest.git] / src / server.cpp

diff --git a/src/server.cpp b/src/server.cpp
index 75b47e498f50af5ead900118257f10e9236b1172..c7b64f413eee08fc3b5c77bcacc5e9e213f6c039 100644 (file)
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -3674,12 +3674,12 @@ void Server::UpdateCrafting(u16 peer_id)
                        if(!found)
                        {
                                ItemSpec specs[9];
+                               specs[3] = ItemSpec(ITEM_CRAFT, "Stick");
                                specs[4] = ItemSpec(ITEM_CRAFT, "Stick");
                                specs[5] = ItemSpec(ITEM_CRAFT, "Stick");
                                specs[6] = ItemSpec(ITEM_CRAFT, "Stick");
                                specs[7] = ItemSpec(ITEM_CRAFT, "Stick");
                                specs[8] = ItemSpec(ITEM_CRAFT, "Stick");
-                               specs[9] = ItemSpec(ITEM_CRAFT, "Stick");
                                if(checkItemCombination(items, specs))
                                {
                                        rlist->addItem(new MaterialItem(CONTENT_FENCE, 2));
@@ -3972,6 +3972,21 @@ void Server::UpdateCrafting(u16 peer_id)
                                        found = true;
                                }
                        }
+
+                       // Sandstone
+                       if(!found)
+                       {
+                               ItemSpec specs[9];
+                               specs[3] = ItemSpec(ITEM_MATERIAL, CONTENT_SAND);
+                               specs[4] = ItemSpec(ITEM_MATERIAL, CONTENT_SAND);
+                               specs[6] = ItemSpec(ITEM_MATERIAL, CONTENT_SAND);
+                               specs[7] = ItemSpec(ITEM_MATERIAL, CONTENT_SAND);
+                               if(checkItemCombination(items, specs))
+                               {
+                                       rlist->addItem(new MaterialItem(CONTENT_SANDSTONE, 1));
+                                       found = true;
+                               }
+                       }
                }
        
        } // if creative_mode == false
@@ -4060,6 +4075,7 @@ void setCreativeInventory(Player *player)
                CONTENT_MUD,
                CONTENT_STONE,
                CONTENT_SAND,
+               CONTENT_SANDSTONE,
                CONTENT_TREE,
                CONTENT_LEAVES,
                CONTENT_GLASS,