From b87ef5ccde9cfa9096cae1e27774a9c386399b00 Mon Sep 17 00:00:00 2001
From: SmallJoker <mk939@ymail.com>
Date: Sun, 12 Mar 2017 14:03:37 +0100
Subject: [PATCH] Keys: Update default.can_interact_with_node to new item meta
Completes a forgotten update in 9d3a526
---
mods/default/functions.lua | 28 +++++++++++++++-------------
mods/default/nodes.lua | 1 +
mods/doors/init.lua | 1 +
3 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/mods/default/functions.lua b/mods/default/functions.lua
index 9ba0e78..eeac0c2 100644
--- a/mods/default/functions.lua
+++ b/mods/default/functions.lua
@@ -551,21 +551,23 @@ function default.can_interact_with_node(player, pos)
local meta = minetest.get_meta(pos)
- -- is player wielding the right key?
- local item = player:get_wielded_item()
- if item:get_name() == "default:key" then
- local key_meta = minetest.parse_json(item:get_metadata())
- local secret = meta:get_string("key_lock_secret")
- if secret ~= key_meta.secret then
- return false
- end
-
+ if player:get_player_name() == meta:get_string("owner") then
+ -- Owner can access the node to any time
return true
end
- if player:get_player_name() ~= meta:get_string("owner") then
- return false
+ -- is player wielding the right key?
+ local item = player:get_wielded_item()
+ if item:get_name() == "default:key" then
+ local key_meta = item:get_meta()
+
+ if key_meta:get_string("secret") == "" then
+ key_meta:set_string("secret", minetest.parse_json(item:get_metadata()).secret)
+ item:set_metadata("")
+ end
+
+ return meta:get_string("key_lock_secret") == key_meta:get_string("secret")
end
- return true
-end
\ No newline at end of file
+ return false
+end
diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua
index 1eb2f30..0523097 100644
--- a/mods/default/nodes.lua
+++ b/mods/default/nodes.lua
@@ -1805,6 +1805,7 @@ minetest.register_node("default:chest_locked", {
if key_meta:get_string("secret") == "" then
key_meta:set_string("secret", minetest.parse_json(itemstack:get_metadata()).secret)
+ itemstack:set_metadata("")
end
if secret ~= key_meta:get_string("secret") then
diff --git a/mods/doors/init.lua b/mods/doors/init.lua
index 53e2793..0ed98b3 100644
--- a/mods/doors/init.lua
+++ b/mods/doors/init.lua
@@ -149,6 +149,7 @@ function _doors.door_toggle(pos, node, clicker)
if key_meta:get_string("secret") == "" then
key_meta:set_string("secret", minetest.parse_json(item:get_metadata()).secret)
+ item:set_metadata("")
end
if secret ~= key_meta:get_string("secret") then