minetest/minetest_game
1
0
Fork 2
mirror of https://github.com/minetest/minetest_game.git synced 2024-12-22 15:00:18 +01:00
Code Issues Releases Wiki Activity

Fix set_node(air) calls

Browse Source 
In the fireflies case it can be replaced with remove_node.
In the beds case we fix the logic to do what it should. Coincidentally the end result was correct nonetheless.
This commit is contained in:
sfan5 2024-04-13 13:32:18 +02:00
parent 0639681f9b
commit 31133a371e
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mods/beds/api.lua
View File

@ -1,3 +1,10 @@
-- Removes a node without calling on on_destruct()
-- We use this to mess with bed nodes without causing unwanted recursion.
local function remove_no_destruct(pos)
minetest.swap_node(pos, {name = "air"})
minetest.remove_node(pos) -- Now clear the meta
minetest.check_for_falling(pos)
end
local function destruct_bed(pos, n) local function destruct_bed(pos, n)
local node = minetest.get_node(pos) local node = minetest.get_node(pos)
@ -12,10 +19,7 @@ local function destruct_bed(pos, n)
end end
local oname = minetest.get_node(other).name local oname = minetest.get_node(other).name
if minetest.get_item_group(oname, "bed") ~= 0 then if minetest.get_item_group(oname, "bed") ~= 0 then
-- Swap node leaves meta, but doesn't call destruct_bed again remove_no_destruct(other)
minetest.swap_node(other, {name = "air"})
minetest.remove_node(other) -- Now clear the meta
minetest.check_for_falling(other)
beds.remove_spawns_at(pos) beds.remove_spawns_at(pos)
beds.remove_spawns_at(other) beds.remove_spawns_at(other)
end end
@ -110,6 +114,7 @@ function beds.register_bed(name, def)
on_rotate = function(pos, node, user, _, new_param2) on_rotate = function(pos, node, user, _, new_param2)
local dir = minetest.facedir_to_dir(node.param2) local dir = minetest.facedir_to_dir(node.param2)
-- old position of the top node
local p = vector.add(pos, dir) local p = vector.add(pos, dir)
local node2 = minetest.get_node_or_nil(p) local node2 = minetest.get_node_or_nil(p)
if not node2 or minetest.get_item_group(node2.name, "bed") ~= 2 or if not node2 or minetest.get_item_group(node2.name, "bed") ~= 2 or
@ -123,6 +128,7 @@ function beds.register_bed(name, def)
if new_param2 % 32 > 3 then if new_param2 % 32 > 3 then
return false return false
end end
-- new position of the top node
local newp = vector.add(pos, minetest.facedir_to_dir(new_param2)) local newp = vector.add(pos, minetest.facedir_to_dir(new_param2))
local node3 = minetest.get_node_or_nil(newp) local node3 = minetest.get_node_or_nil(newp)
local node_def = node3 and minetest.registered_nodes[node3.name] local node_def = node3 and minetest.registered_nodes[node3.name]
@ -134,8 +140,7 @@ function beds.register_bed(name, def)
return false return false
end end
node.param2 = new_param2 node.param2 = new_param2
-- do not remove_node here - it will trigger destroy_bed() remove_no_destruct(p)
minetest.set_node(p, {name = "air"})
minetest.set_node(pos, node) minetest.set_node(pos, node)
minetest.set_node(newp, {name = name .. "_top", param2 = new_param2}) minetest.set_node(newp, {name = name .. "_top", param2 = new_param2})
return true return true

2
mods/fireflies/init.lua
View File

@ -104,7 +104,7 @@ minetest.register_tool("fireflies:bug_net", {
local node_name = minetest.get_node(pointed_thing.under).name local node_name = minetest.get_node(pointed_thing.under).name
local inv = player:get_inventory() local inv = player:get_inventory()
if minetest.get_item_group(node_name, "catchable") == 1 then if minetest.get_item_group(node_name, "catchable") == 1 then
minetest.set_node(pointed_thing.under, {name = "air"}) minetest.remove_node(pointed_thing.under)
local stack = ItemStack(node_name.." 1") local stack = ItemStack(node_name.." 1")
local leftover = inv:add_item("main", stack) local leftover = inv:add_item("main", stack)
if leftover:get_count() > 0 then if leftover:get_count() > 0 then