Fix regression & replace more occurrences of vector.new with vector.copy (#12539)

diff --git a/builtin/game/falling.lua b/builtin/game/falling.lua
index 29cb56aae046d5da43f11957026dfd3faa9b6a9d..023bd1fa38bb375e4b1ec1a5ac6b922f07de6515 100644 (file)
--- a/builtin/game/falling.lua
+++ b/builtin/game/falling.lua
@@ -264,7 +264,7 @@ core.register_entity(":__builtin:falling_node", {
                end
 
                -- Decide if we're replacing the node or placing on top
-               local np = vector.new(bcp)
+               local np = vector.copy(bcp)
                if bcd and bcd.buildable_to and
                                (not self.floats or bcd.liquidtype == "none") then
                        core.remove_node(bcp)
@@ -436,7 +436,7 @@ local function drop_attached_node(p)
        if def and def.preserve_metadata then
                local oldmeta = core.get_meta(p):to_table().fields
                -- Copy pos and node because the callback can modify them.
-               local pos_copy = vector.new(p)
+               local pos_copy = vector.copy(p)
                local node_copy = {name=n.name, param1=n.param1, param2=n.param2}
                local drop_stacks = {}
                for k, v in pairs(drops) do
@@ -461,7 +461,7 @@ end
 
 function builtin_shared.check_attached_node(p, n)
        local def = core.registered_nodes[n.name]
-       local d = vector.new()
+       local d = vector.zero()
        if def.paramtype2 == "wallmounted" or
                        def.paramtype2 == "colorwallmounted" then
                -- The fallback vector here is in case 'wallmounted to dir' is nil due

diff --git a/builtin/game/item.lua b/builtin/game/item.lua
index 659d2133137aa4dcd0c3cb738f05392d93f756d5..b4978798742ac1856aab5315d037dd3fb718394b 100644 (file)
--- a/builtin/game/item.lua
+++ b/builtin/game/item.lua
@@ -5,8 +5,8 @@ local builtin_shared = ...
 local function copy_pointed_thing(pointed_thing)
        return {
                type  = pointed_thing.type,
-               above = vector.copy(pointed_thing.above),
-               under = vector.copy(pointed_thing.under),
+               above = pointed_thing.above and vector.copy(pointed_thing.above),
+               under = pointed_thing.under and vector.copy(pointed_thing.under),
                ref   = pointed_thing.ref,
        }
 end
@@ -176,12 +176,12 @@ function core.item_place_node(itemstack, placer, pointed_thing, param2,
        end
 
        -- Place above pointed node
-       local place_to = vector.new(above)
+       local place_to = vector.copy(above)
 
        -- If node under is buildable_to, place into it instead (eg. snow)
        if olddef_under.buildable_to then
                log("info", "node under is buildable to")
-               place_to = vector.new(under)
+               place_to = vector.copy(under)
        end
 
        if core.is_protected(place_to, playername) then
@@ -262,7 +262,7 @@ function core.item_place_node(itemstack, placer, pointed_thing, param2,
        -- Run callback
        if def.after_place_node and not prevent_after_place then
                -- Deepcopy place_to and pointed_thing because callback can modify it
-               local place_to_copy = vector.new(place_to)
+               local place_to_copy = vector.copy(place_to)
                local pointed_thing_copy = copy_pointed_thing(pointed_thing)
                if def.after_place_node(place_to_copy, placer, itemstack,
                                pointed_thing_copy) then
@@ -273,7 +273,7 @@ function core.item_place_node(itemstack, placer, pointed_thing, param2,
        -- Run script hook
        for _, callback in ipairs(core.registered_on_placenodes) do
                -- Deepcopy pos, node and pointed_thing because callback can modify them
-               local place_to_copy = vector.new(place_to)
+               local place_to_copy = vector.copy(place_to)
                local newnode_copy = {name=newnode.name, param1=newnode.param1, param2=newnode.param2}
                local oldnode_copy = {name=oldnode.name, param1=oldnode.param1, param2=oldnode.param2}
                local pointed_thing_copy = copy_pointed_thing(pointed_thing)
@@ -401,7 +401,7 @@ function core.node_punch(pos, node, puncher, pointed_thing)
        -- Run script hook
        for _, callback in ipairs(core.registered_on_punchnodes) do
                -- Copy pos and node because callback can modify them
-               local pos_copy = vector.new(pos)
+               local pos_copy = vector.copy(pos)
                local node_copy = {name=node.name, param1=node.param1, param2=node.param2}
                local pointed_thing_copy = pointed_thing and copy_pointed_thing(pointed_thing) or nil
                callback(pos_copy, node_copy, puncher, pointed_thing_copy)
@@ -442,7 +442,7 @@ function core.node_dig(pos, node, digger)
        local def = core.registered_nodes[node.name]
        -- Copy pos because the callback could modify it
        if def and (not def.diggable or
-                       (def.can_dig and not def.can_dig(vector.new(pos), digger))) then
+                       (def.can_dig and not def.can_dig(vector.copy(pos), digger))) then
                log("info", diggername .. " tried to dig "
                        .. node.name .. " which is not diggable "
                        .. core.pos_to_string(pos))
@@ -489,7 +489,7 @@ function core.node_dig(pos, node, digger)
        if def and def.preserve_metadata then
                local oldmeta = core.get_meta(pos):to_table().fields
                -- Copy pos and node because the callback can modify them.
-               local pos_copy = vector.new(pos)
+               local pos_copy = vector.copy(pos)
                local node_copy = {name=node.name, param1=node.param1, param2=node.param2}
                local drop_stacks = {}
                for k, v in pairs(drops) do
@@ -521,7 +521,7 @@ function core.node_dig(pos, node, digger)
        -- Run callback
        if def and def.after_dig_node then
                -- Copy pos and node because callback can modify them
-               local pos_copy = vector.new(pos)
+               local pos_copy = vector.copy(pos)
                local node_copy = {name=node.name, param1=node.param1, param2=node.param2}
                def.after_dig_node(pos_copy, node_copy, oldmetadata, digger)
        end
@@ -532,7 +532,7 @@ function core.node_dig(pos, node, digger)
                core.set_last_run_mod(origin.mod)
 
                -- Copy pos and node because callback can modify them
-               local pos_copy = vector.new(pos)
+               local pos_copy = vector.copy(pos)
                local node_copy = {name=node.name, param1=node.param1, param2=node.param2}
                callback(pos_copy, node_copy, digger)
        end

diff --git a/games/devtest/mods/unittests/misc.lua b/games/devtest/mods/unittests/misc.lua
index 9ddb0706122aa5a0ea8f21cc4a76ca35fa82198f..4811c8008d7b255d7162a24fe3a2b6c29ddd4af4 100644 (file)
--- a/games/devtest/mods/unittests/misc.lua
+++ b/games/devtest/mods/unittests/misc.lua
@@ -68,3 +68,15 @@ local function test_clear_meta(_, pos)
        end
 end
 unittests.register("test_clear_meta", test_clear_meta, {map=true})
+
+local on_punch_called
+minetest.register_on_punchnode(function()
+       on_punch_called = true
+end)
+unittests.register("test_punch_node", function(_, pos)
+       minetest.place_node(pos, {name="basenodes:dirt"})
+       on_punch_called = false
+       minetest.punch_node(pos)
+       minetest.remove_node(pos)
+       -- currently failing: assert(on_punch_called)
+end, {map=true})