Improved Scaffold

diff --git a/builtin/client/cheats/world.lua b/builtin/client/cheats/world.lua
index 6cbdd67fc808f9a900d3ff0e39e292ae4283d3e8..1a86e0703dade3e7f1c090aa63fb63989028fa89 100644 (file)
--- a/builtin/client/cheats/world.lua
+++ b/builtin/client/cheats/world.lua
@@ -17,7 +17,11 @@ core.register_globalstep(function(dtime)
        local nodes_per_tick = tonumber(minetest.settings:get("nodes_per_tick")) or 8
        if item and item:get_count() > 0 and def and def.node_placement_prediction ~= "" then
                if core.settings:get_bool("scaffold") then
-                       core.place_node(vector.add(pos, {x = 0, y = -0.6, z = 0}))
+                       local p = vector.round(vector.add(pos, {x = 0, y = -0.6, z = 0}))
+                       local node = minetest.get_node_or_nil(p)
+                       if not node or minetest.get_node_def(node.name).buildable_to then
+                               core.place_node(p)
+                       end
                elseif core.settings:get_bool("scaffold_plus") then
                        local z = pos.z
                        local positions = {

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index ec1b915ca3d5f5149798ee85f8732d5163927377..bfcee01f8721be32e9870a7b27696966d4486ae7 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -53,7 +53,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("screenshot_quality", "0");
        settings->setDefault("client_unload_unused_data_timeout", "600");
        settings->setDefault("client_mapblock_limit", "5000");
-       settings->setDefault("enable_build_where_you_stand", "false");
+       settings->setDefault("enable_build_where_you_stand", "true");
        settings->setDefault("curl_timeout", "5000");
        settings->setDefault("curl_parallel_limit", "8");
        settings->setDefault("curl_file_download_timeout", "300000");