mff/mff_game
1
0
Fork 0
forked from minetest/minetest_game
Code Issues Pull Requests Releases Wiki Activity

Doors: Fix missing node parameter passing

Browse Source
This commit is contained in:
Tim 2016-07-11 17:50:19 +02:00 committed by paramat
parent 07141b4a2e
commit b74954969c
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mods/doors/init.lua
View File

@ -25,16 +25,16 @@ function doors.get(pos)
if self:state() then if self:state() then
return false return false
end end
return _doors.door_toggle(self.pos, player) return _doors.door_toggle(self.pos, nil, player)
end, end,
close = function(self, player) close = function(self, player)
if not self:state() then if not self:state() then
return false return false
end end
return _doors.door_toggle(self.pos, player) return _doors.door_toggle(self.pos, nil, player)
end, end,
toggle = function(self, player) toggle = function(self, player)
return _doors.door_toggle(self.pos, player) return _doors.door_toggle(self.pos, nil, player)
end, end,
state = function(self) state = function(self)
local state = minetest.get_meta(self.pos):get_int("state") local state = minetest.get_meta(self.pos):get_int("state")
@ -49,19 +49,19 @@ function doors.get(pos)
if self:state() then if self:state() then
return false return false
end end
return _doors.trapdoor_toggle(self.pos, player) return _doors.trapdoor_toggle(self.pos, nil, player)
end, end,
close = function(self, player) close = function(self, player)
if not self:state() then if not self:state() then
return false return false
end end
return _doors.trapdoor_toggle(self.pos, player) return _doors.trapdoor_toggle(self.pos, nil, player)
end, end,
toggle = function(self, player) toggle = function(self, player)
return _doors.trapdoor_toggle(self.pos, player) return _doors.trapdoor_toggle(self.pos, nil, player)
end, end,
state = function(self) state = function(self)
return node_name:sub(-5) == "_open" return minetest.get_node(self.pos).name:sub(-5) == "_open"
end end
} }
else else
@ -131,6 +131,7 @@ local transform = {
function _doors.door_toggle(pos, node, clicker) function _doors.door_toggle(pos, node, clicker)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
node = node or minetest.get_node(pos)
local def = minetest.registered_nodes[node.name] local def = minetest.registered_nodes[node.name]
local name = def.door.name local name = def.door.name
@ -508,6 +509,7 @@ end
----trapdoor---- ----trapdoor----
function _doors.trapdoor_toggle(pos, node, clicker) function _doors.trapdoor_toggle(pos, node, clicker)
node = node or minetest.get_node(pos)
if clicker and not minetest.check_player_privs(clicker, "protection_bypass") then if clicker and not minetest.check_player_privs(clicker, "protection_bypass") then
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
local owner = meta:get_string("doors_owner") local owner = meta:get_string("doors_owner")