Fix rename modpack button not working, fixes #1019

[dragonfireclient.git] / builtin / falling.lua

diff --git a/builtin/falling.lua b/builtin/falling.lua
index 91e732a4b1c07df160b84c8dd28b408e0db53473..c8f3bc556a4d7903a083d1eef4e3f516d4d18865 100644 (file)
--- a/builtin/falling.lua
+++ b/builtin/falling.lua
@@ -54,12 +54,25 @@ minetest.register_entity("__builtin:falling_node", {
                local pos = self.object:getpos()
                local bcp = {x=pos.x, y=pos.y-0.7, z=pos.z} -- Position of bottom center point
                local bcn = minetest.get_node(bcp)
+               local bcd = minetest.registered_nodes[bcn.name]
                -- Note: walkable is in the node definition, not in item groups
-               if minetest.registered_nodes[bcn.name] and
-                               minetest.registered_nodes[bcn.name].walkable or
-                               (minetest.get_node_group(self.node.name, "float") ~= 0 and minetest.registered_nodes[bcn.name].liquidtype ~= "none")
-                       then
-                       if minetest.registered_nodes[bcn.name].buildable_to and (minetest.get_node_group(self.node.name, "float") == 0 or minetest.registered_nodes[bcn.name].liquidtype == "none") then
+               if not bcd or
+                               (bcd.walkable or
+                               (minetest.get_node_group(self.node.name, "float") ~= 0 and
+                               bcd.liquidtype ~= "none")) then
+                       if bcd and bcd.leveled and
+                                       bcn.name == self.node.name then
+                               local addlevel = self.node.level
+                               if addlevel == nil or addlevel <= 0 then
+                                       addlevel = bcd.leveled
+                               end
+                               if minetest.add_node_level(bcp, addlevel) == 0 then
+                                       self.object:remove()
+                                       return
+                               end
+                       elseif bcd and bcd.buildable_to and
+                                       (minetest.get_node_group(self.node.name, "float") == 0 or
+                                       bcd.liquidtype == "none") then
                                minetest.remove_node(bcp)
                                return
                        end
@@ -152,11 +165,13 @@ function nodeupdate_single(p, delay)
                -- Note: walkable is in the node definition, not in item groups
                if minetest.registered_nodes[n_bottom.name] and
                                (minetest.get_node_group(n.name, "float") == 0 or minetest.registered_nodes[n_bottom.name].liquidtype == "none") and
+                               (n.name ~= n_bottom.name or (minetest.registered_nodes[n_bottom.name].leveled and minetest.env:get_node_level(p_bottom) < minetest.env:get_node_max_level(p_bottom))) and
                                (not minetest.registered_nodes[n_bottom.name].walkable or 
                                        minetest.registered_nodes[n_bottom.name].buildable_to) then
                        if delay then
                                minetest.after(0.1, nodeupdate_single, {x=p.x, y=p.y, z=p.z}, false)
                        else
+                               n.level = minetest.env:get_node_level(p)
                                minetest.remove_node(p)
                                spawn_falling_node(p, n)
                                nodeupdate(p)