Luanti/minetest_game
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

solve mergeconflicts

Browse source 
* tmp drop farming+boats
    * correct tnt
    * drop original readme.txt
This commit is contained in:
Milan* 2017-03-11 13:09:26 +01:00
commit c836129bff
78 changed files with 1432 additions and 383 deletions
Download patch file Download diff file Expand all files Collapse all files

25
mods/doors/init.lua
View file

@ -144,9 +144,14 @@ function _doors.door_toggle(pos, node, clicker)
local item = clicker:get_wielded_item()
local owner = meta:get_string("doors_owner")
if item:get_name() == "default:key" then
local key_meta = minetest.parse_json(item:get_metadata())
local key_meta = item:get_meta()
local secret = meta:get_string("key_lock_secret")
if secret ~= key_meta.secret then
if key_meta:get_string("secret") == "" then
key_meta:set_string("secret", minetest.parse_json(item:get_metadata()).secret)
end
if secret ~= key_meta:get_string("secret") then
return false
end
@ -265,7 +270,8 @@ function doors.register(name, def)
local node = minetest.get_node(pointed_thing.under)
local pdef = minetest.registered_nodes[node.name]
if pdef and pdef.on_rightclick then
if pdef and pdef.on_rightclick and
not placer:get_player_control().sneak then
return pdef.on_rightclick(pointed_thing.under,
node, placer, itemstack, pointed_thing)
end
@ -375,7 +381,9 @@ function doors.register(name, def)
minetest.remove_node({x = pos.x, y = pos.y + 1, z = pos.z})
minetest.check_for_falling({x = pos.x, y = pos.y + 1, z = pos.z})
end
def.on_rotate = false
def.on_rotate = function(pos, node, user, mode, new_param2)
return false
end
if def.protected then
def.can_dig = can_dig_door
@ -529,9 +537,14 @@ function _doors.trapdoor_toggle(pos, node, clicker)
local meta = minetest.get_meta(pos)
local owner = meta:get_string("doors_owner")
if item:get_name() == "default:key" then
local key_meta = minetest.parse_json(item:get_metadata())
local key_meta = item:get_meta()
local secret = meta:get_string("key_lock_secret")
if secret ~= key_meta.secret then
if key_meta:get_string("secret") == "" then
key_meta:set_string("secret", minetest.parse_json(item:get_metadata()).secret)
end
if secret ~= key_meta:get_string("secret") then
return false
end