nalc/pipeworks
1
0
Fork 0
forked from mtcontrib/pipeworks
Code Issues Pull Requests Releases Wiki Activity

Fix node breaker, use new minetest.swap_node

Browse Source
This commit is contained in:
Novatux 2013-12-21 10:24:55 +01:00
parent 75db2c5307
commit 5a2d57b485
2 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
deployer.lua
View File

@ -66,24 +66,20 @@ minetest.register_craft({
}
})
local function hacky_swap_node(pos,name)
local function swap_node(pos, name)
local node = minetest.get_node(pos)
local meta=minetest.get_meta(pos)
local meta0=meta:to_table()
if node.name == name then
return
end
node.name = name
minetest.add_node(pos, node)
local meta=minetest.get_meta(pos)
meta:from_table(meta0)
minetest.swap_node(pos, node)
end
local function delay(x)
return (function() return x end)
end
local deployer_on = function(pos, node)
local function deployer_on(pos, node)
if node.name ~= "pipeworks:deployer_off" then
return
end
@ -92,7 +88,7 @@ local deployer_on = function(pos, node)
local dir = minetest.facedir_to_dir(node.param2)
local pos_under, pos_above = {x = pos.x - dir.x, y = pos.y - dir.y, z = pos.z - dir.z}, {x = pos.x - 2*dir.x, y = pos.y - 2*dir.y, z = pos.z - 2*dir.z}
hacky_swap_node(pos,"pipeworks:deployer_on")
swap_node(pos, "pipeworks:deployer_on")
nodeupdate(pos)
local meta = minetest.get_meta(pos)
@ -163,7 +159,7 @@ end
local deployer_off = function(pos, node)
if node.name == "pipeworks:deployer_on" then
hacky_swap_node(pos,"pipeworks:deployer_off")
swap_node(pos, "pipeworks:deployer_off")
nodeupdate(pos)
end
end

18
node_breaker.lua
View File

@ -14,17 +14,13 @@ minetest.register_craft({
}
})
local function hacky_swap_node(pos,name)
local function swap_node(pos, name)
local node = minetest.get_node(pos)
local meta=minetest.get_meta(pos)
local meta0=meta:to_table()
if node.name == name then
return
end
node.name = name
minetest.add_node(pos, node)
local meta=minetest.get_meta(pos)
meta:from_table(meta0)
minetest.swap_node(pos, node)
end
--define the functions from https://github.com/minetest/minetest/pull/834 while waiting for the devs to notice it
@ -91,7 +87,6 @@ local function break_node (pos, facedir)
local vel = minetest.facedir_to_dir(facedir);
local front = {x=pos.x - vel.x, y=pos.y - vel.y, z=pos.z - vel.z}
local back = {x=pos.x + vel.x, y=pos.y + vel.y, z=pos.z + vel.z}
local node = minetest.get_node(front)
if node.name == "air" or node.name == "ignore" then
@ -168,6 +163,11 @@ local function break_node (pos, facedir)
item1:setacceleration({x=0, y=0, z=0})
end
local oldmetadata = nil
if def.after_dig_node then
oldmetadata = minetest.get_meta(front):to_table()
end
minetest.remove_node(front)
--handle post-digging callback
@ -189,7 +189,7 @@ end
local node_breaker_on = function(pos, node)
if node.name == "pipeworks:nodebreaker_off" then
hacky_swap_node(pos,"pipeworks:nodebreaker_on")
swap_node(pos, "pipeworks:nodebreaker_on")
break_node(pos, node.param2)
nodeupdate(pos)
end
@ -197,7 +197,7 @@ end
local node_breaker_off = function(pos, node)
if node.name == "pipeworks:nodebreaker_on" then
hacky_swap_node(pos,"pipeworks:nodebreaker_off")
swap_node(pos, "pipeworks:nodebreaker_off")
nodeupdate(pos)
end
end