mirror of
https://github.com/minetest/minetest.git
synced 2024-11-30 03:23:45 +01:00
Fix regression & replace more occurrences of vector.new with vector.copy (#12539)
This commit is contained in:
parent
f4c6ed863d
commit
b204655081
@ -264,7 +264,7 @@ core.register_entity(":__builtin:falling_node", {
|
|||||||
end
|
end
|
||||||
|
|
||||||
-- Decide if we're replacing the node or placing on top
|
-- 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
|
if bcd and bcd.buildable_to and
|
||||||
(not self.floats or bcd.liquidtype == "none") then
|
(not self.floats or bcd.liquidtype == "none") then
|
||||||
core.remove_node(bcp)
|
core.remove_node(bcp)
|
||||||
@ -436,7 +436,7 @@ local function drop_attached_node(p)
|
|||||||
if def and def.preserve_metadata then
|
if def and def.preserve_metadata then
|
||||||
local oldmeta = core.get_meta(p):to_table().fields
|
local oldmeta = core.get_meta(p):to_table().fields
|
||||||
-- Copy pos and node because the callback can modify them.
|
-- 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 node_copy = {name=n.name, param1=n.param1, param2=n.param2}
|
||||||
local drop_stacks = {}
|
local drop_stacks = {}
|
||||||
for k, v in pairs(drops) do
|
for k, v in pairs(drops) do
|
||||||
@ -461,7 +461,7 @@ end
|
|||||||
|
|
||||||
function builtin_shared.check_attached_node(p, n)
|
function builtin_shared.check_attached_node(p, n)
|
||||||
local def = core.registered_nodes[n.name]
|
local def = core.registered_nodes[n.name]
|
||||||
local d = vector.new()
|
local d = vector.zero()
|
||||||
if def.paramtype2 == "wallmounted" or
|
if def.paramtype2 == "wallmounted" or
|
||||||
def.paramtype2 == "colorwallmounted" then
|
def.paramtype2 == "colorwallmounted" then
|
||||||
-- The fallback vector here is in case 'wallmounted to dir' is nil due
|
-- The fallback vector here is in case 'wallmounted to dir' is nil due
|
||||||
|
@ -5,8 +5,8 @@ local builtin_shared = ...
|
|||||||
local function copy_pointed_thing(pointed_thing)
|
local function copy_pointed_thing(pointed_thing)
|
||||||
return {
|
return {
|
||||||
type = pointed_thing.type,
|
type = pointed_thing.type,
|
||||||
above = vector.copy(pointed_thing.above),
|
above = pointed_thing.above and vector.copy(pointed_thing.above),
|
||||||
under = vector.copy(pointed_thing.under),
|
under = pointed_thing.under and vector.copy(pointed_thing.under),
|
||||||
ref = pointed_thing.ref,
|
ref = pointed_thing.ref,
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
@ -176,12 +176,12 @@ function core.item_place_node(itemstack, placer, pointed_thing, param2,
|
|||||||
end
|
end
|
||||||
|
|
||||||
-- Place above pointed node
|
-- 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 node under is buildable_to, place into it instead (eg. snow)
|
||||||
if olddef_under.buildable_to then
|
if olddef_under.buildable_to then
|
||||||
log("info", "node under is buildable to")
|
log("info", "node under is buildable to")
|
||||||
place_to = vector.new(under)
|
place_to = vector.copy(under)
|
||||||
end
|
end
|
||||||
|
|
||||||
if core.is_protected(place_to, playername) then
|
if core.is_protected(place_to, playername) then
|
||||||
@ -262,7 +262,7 @@ function core.item_place_node(itemstack, placer, pointed_thing, param2,
|
|||||||
-- Run callback
|
-- Run callback
|
||||||
if def.after_place_node and not prevent_after_place then
|
if def.after_place_node and not prevent_after_place then
|
||||||
-- Deepcopy place_to and pointed_thing because callback can modify it
|
-- 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)
|
local pointed_thing_copy = copy_pointed_thing(pointed_thing)
|
||||||
if def.after_place_node(place_to_copy, placer, itemstack,
|
if def.after_place_node(place_to_copy, placer, itemstack,
|
||||||
pointed_thing_copy) then
|
pointed_thing_copy) then
|
||||||
@ -273,7 +273,7 @@ function core.item_place_node(itemstack, placer, pointed_thing, param2,
|
|||||||
-- Run script hook
|
-- Run script hook
|
||||||
for _, callback in ipairs(core.registered_on_placenodes) do
|
for _, callback in ipairs(core.registered_on_placenodes) do
|
||||||
-- Deepcopy pos, node and pointed_thing because callback can modify them
|
-- 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 newnode_copy = {name=newnode.name, param1=newnode.param1, param2=newnode.param2}
|
||||||
local oldnode_copy = {name=oldnode.name, param1=oldnode.param1, param2=oldnode.param2}
|
local oldnode_copy = {name=oldnode.name, param1=oldnode.param1, param2=oldnode.param2}
|
||||||
local pointed_thing_copy = copy_pointed_thing(pointed_thing)
|
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
|
-- Run script hook
|
||||||
for _, callback in ipairs(core.registered_on_punchnodes) do
|
for _, callback in ipairs(core.registered_on_punchnodes) do
|
||||||
-- Copy pos and node because callback can modify them
|
-- 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 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
|
local pointed_thing_copy = pointed_thing and copy_pointed_thing(pointed_thing) or nil
|
||||||
callback(pos_copy, node_copy, puncher, pointed_thing_copy)
|
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]
|
local def = core.registered_nodes[node.name]
|
||||||
-- Copy pos because the callback could modify it
|
-- Copy pos because the callback could modify it
|
||||||
if def and (not def.diggable or
|
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 "
|
log("info", diggername .. " tried to dig "
|
||||||
.. node.name .. " which is not diggable "
|
.. node.name .. " which is not diggable "
|
||||||
.. core.pos_to_string(pos))
|
.. core.pos_to_string(pos))
|
||||||
@ -489,7 +489,7 @@ function core.node_dig(pos, node, digger)
|
|||||||
if def and def.preserve_metadata then
|
if def and def.preserve_metadata then
|
||||||
local oldmeta = core.get_meta(pos):to_table().fields
|
local oldmeta = core.get_meta(pos):to_table().fields
|
||||||
-- Copy pos and node because the callback can modify them.
|
-- 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 node_copy = {name=node.name, param1=node.param1, param2=node.param2}
|
||||||
local drop_stacks = {}
|
local drop_stacks = {}
|
||||||
for k, v in pairs(drops) do
|
for k, v in pairs(drops) do
|
||||||
@ -521,7 +521,7 @@ function core.node_dig(pos, node, digger)
|
|||||||
-- Run callback
|
-- Run callback
|
||||||
if def and def.after_dig_node then
|
if def and def.after_dig_node then
|
||||||
-- Copy pos and node because callback can modify them
|
-- 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 node_copy = {name=node.name, param1=node.param1, param2=node.param2}
|
||||||
def.after_dig_node(pos_copy, node_copy, oldmetadata, digger)
|
def.after_dig_node(pos_copy, node_copy, oldmetadata, digger)
|
||||||
end
|
end
|
||||||
@ -532,7 +532,7 @@ function core.node_dig(pos, node, digger)
|
|||||||
core.set_last_run_mod(origin.mod)
|
core.set_last_run_mod(origin.mod)
|
||||||
|
|
||||||
-- Copy pos and node because callback can modify them
|
-- 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 node_copy = {name=node.name, param1=node.param1, param2=node.param2}
|
||||||
callback(pos_copy, node_copy, digger)
|
callback(pos_copy, node_copy, digger)
|
||||||
end
|
end
|
||||||
|
@ -68,3 +68,15 @@ local function test_clear_meta(_, pos)
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
unittests.register("test_clear_meta", test_clear_meta, {map=true})
|
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})
|
||||||
|
Loading…
Reference in New Issue
Block a user