]> git.lizzy.rs Git - minetest.git/blobdiff - builtin/game/falling.lua
Fix minetest.item_eat's replace_with_item, fixes #2292
[minetest.git] / builtin / game / falling.lua
index 93d17221a7593a250cb83e08f548c5745aff9864..58f68fc56f51525f404436a9029e13d21c505d3c 100644 (file)
@@ -4,7 +4,7 @@
 -- Falling stuff
 --
 
-minetest.register_entity(":__builtin:falling_node", {
+core.register_entity(":__builtin:falling_node", {
        initial_properties = {
                physical = true,
                collide_with_objects = false,
@@ -26,11 +26,11 @@ minetest.register_entity(":__builtin:falling_node", {
                end
                local item_texture = nil
                local item_type = ""
-               if minetest.registered_items[itemname] then
-                       item_texture = minetest.registered_items[itemname].inventory_image
-                       item_type = minetest.registered_items[itemname].type
+               if core.registered_items[itemname] then
+                       item_texture = core.registered_items[itemname].inventory_image
+                       item_type = core.registered_items[itemname].type
                end
-               prop = {
+               local prop = {
                        is_visible = true,
                        textures = {node.name},
                }
@@ -43,7 +43,6 @@ minetest.register_entity(":__builtin:falling_node", {
 
        on_activate = function(self, staticdata)
                self.object:set_armor_groups({immortal=1})
-               --self.object:setacceleration({x=0, y=-10, z=0})
                self:set_node({name=staticdata})
        end,
 
@@ -53,12 +52,12 @@ minetest.register_entity(":__builtin:falling_node", {
                -- Turn to actual sand when collides to ground or just move
                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]
+               local bcn = core.get_node(bcp)
+               local bcd = core.registered_nodes[bcn.name]
                -- Note: walkable is in the node definition, not in item groups
                if not bcd or
                                (bcd.walkable or
-                               (minetest.get_item_group(self.node.name, "float") ~= 0 and
+                               (core.get_item_group(self.node.name, "float") ~= 0 and
                                bcd.liquidtype ~= "none")) then
                        if bcd and bcd.leveled and
                                        bcn.name == self.node.name then
@@ -66,66 +65,72 @@ minetest.register_entity(":__builtin:falling_node", {
                                if addlevel == nil or addlevel <= 0 then
                                        addlevel = bcd.leveled
                                end
-                               if minetest.add_node_level(bcp, addlevel) == 0 then
+                               if core.add_node_level(bcp, addlevel) == 0 then
                                        self.object:remove()
                                        return
                                end
                        elseif bcd and bcd.buildable_to and
-                                       (minetest.get_item_group(self.node.name, "float") == 0 or
+                                       (core.get_item_group(self.node.name, "float") == 0 or
                                        bcd.liquidtype == "none") then
-                               minetest.remove_node(bcp)
+                               core.remove_node(bcp)
                                return
                        end
                        local np = {x=bcp.x, y=bcp.y+1, z=bcp.z}
                        -- Check what's here
-                       local n2 = minetest.get_node(np)
+                       local n2 = core.get_node(np)
                        -- If it's not air or liquid, remove node and replace it with
                        -- it's drops
-                       if n2.name ~= "air" and (not minetest.registered_nodes[n2.name] or
-                                       minetest.registered_nodes[n2.name].liquidtype == "none") then
-                               local drops = minetest.get_node_drops(n2.name, "")
-                               minetest.remove_node(np)
-                               -- Add dropped items
-                               local _, dropped_item
-                               for _, dropped_item in ipairs(drops) do
-                                       minetest.add_item(np, dropped_item)
+                       if n2.name ~= "air" and (not core.registered_nodes[n2.name] or
+                                       core.registered_nodes[n2.name].liquidtype == "none") then
+                               core.remove_node(np)
+                               if core.registered_nodes[n2.name].buildable_to == false then
+                                       -- Add dropped items
+                                       local drops = core.get_node_drops(n2.name, "")
+                                       local _, dropped_item
+                                       for _, dropped_item in ipairs(drops) do
+                                               core.add_item(np, dropped_item)
+                                       end
                                end
                                -- Run script hook
                                local _, callback
-                               for _, callback in ipairs(minetest.registered_on_dignodes) do
+                               for _, callback in ipairs(core.registered_on_dignodes) do
                                        callback(np, n2, nil)
                                end
                        end
                        -- Create node and remove entity
-                       minetest.add_node(np, self.node)
+                       core.add_node(np, self.node)
                        self.object:remove()
                        nodeupdate(np)
-               else
-                       -- Do nothing
+                       return
+               end
+               local vel = self.object:getvelocity()
+               if vector.equals(vel, {x=0,y=0,z=0}) then
+                       local npos = self.object:getpos()
+                       self.object:setpos(vector.round(npos))
                end
        end
 })
 
 function spawn_falling_node(p, node)
-       obj = minetest.add_entity(p, "__builtin:falling_node")
+       local obj = core.add_entity(p, "__builtin:falling_node")
        obj:get_luaentity():set_node(node)
 end
 
 function drop_attached_node(p)
-       local nn = minetest.get_node(p).name
-       minetest.remove_node(p)
-       for _,item in ipairs(minetest.get_node_drops(nn, "")) do
+       local nn = core.get_node(p).name
+       core.remove_node(p)
+       for _,item in ipairs(core.get_node_drops(nn, "")) do
                local pos = {
                        x = p.x + math.random()/2 - 0.25,
                        y = p.y + math.random()/2 - 0.25,
                        z = p.z + math.random()/2 - 0.25,
                }
-               minetest.add_item(pos, item)
+               core.add_item(pos, item)
        end
 end
 
 function check_attached_node(p, n)
-       local def = minetest.registered_nodes[n.name]
+       local def = core.registered_nodes[n.name]
        local d = {x=0, y=0, z=0}
        if def.paramtype2 == "wallmounted" then
                if n.param2 == 0 then
@@ -145,8 +150,8 @@ function check_attached_node(p, n)
                d.y = -1
        end
        local p2 = {x=p.x+d.x, y=p.y+d.y, z=p.z+d.z}
-       local nn = minetest.get_node(p2).name
-       local def2 = minetest.registered_nodes[nn]
+       local nn = core.get_node(p2).name
+       local def2 = core.registered_nodes[nn]
        if def2 and not def2.walkable then
                return false
        end
@@ -158,28 +163,30 @@ end
 --
 
 function nodeupdate_single(p, delay)
-       n = minetest.get_node(p)
-       if minetest.get_item_group(n.name, "falling_node") ~= 0 then
-               p_bottom = {x=p.x, y=p.y-1, z=p.z}
-               n_bottom = minetest.get_node(p_bottom)
+       local n = core.get_node(p)
+       if core.get_item_group(n.name, "falling_node") ~= 0 then
+               local p_bottom = {x=p.x, y=p.y-1, z=p.z}
+               local n_bottom = core.get_node(p_bottom)
                -- Note: walkable is in the node definition, not in item groups
-               if minetest.registered_nodes[n_bottom.name] and
-                               (minetest.get_item_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 core.registered_nodes[n_bottom.name] and
+                               (core.get_item_group(n.name, "float") == 0 or
+                                       core.registered_nodes[n_bottom.name].liquidtype == "none") and
+                               (n.name ~= n_bottom.name or (core.registered_nodes[n_bottom.name].leveled and
+                                       core.get_node_level(p_bottom) < core.get_node_max_level(p_bottom))) and
+                               (not core.registered_nodes[n_bottom.name].walkable or
+                                       core.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)
+                               core.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)
+                               n.level = core.get_node_level(p)
+                               core.remove_node(p)
                                spawn_falling_node(p, n)
                                nodeupdate(p)
                        end
                end
        end
-       
-       if minetest.get_item_group(n.name, "attached_node") ~= 0 then
+
+       if core.get_item_group(n.name, "attached_node") ~= 0 then
                if not check_attached_node(p, n) then
                        drop_attached_node(p)
                        nodeupdate(p)
@@ -192,7 +199,7 @@ function nodeupdate(p, delay)
        p.x = math.floor(p.x+0.5)
        p.y = math.floor(p.y+0.5)
        p.z = math.floor(p.z+0.5)
-       
+
        for x = -1,1 do
        for y = -1,1 do
        for z = -1,1 do
@@ -209,9 +216,9 @@ end
 function on_placenode(p, node)
        nodeupdate(p)
 end
-minetest.register_on_placenode(on_placenode)
+core.register_on_placenode(on_placenode)
 
 function on_dignode(p, node)
        nodeupdate(p)
 end
-minetest.register_on_dignode(on_dignode)
+core.register_on_dignode(on_dignode)