From 76a39e71b9f81531e14efd7ec1b0accfefa0fa66 Mon Sep 17 00:00:00 2001
From: Luke aka SwissalpS <Luke@SwissalpS.ws>
Date: Wed, 25 Dec 2019 22:23:34 +0100
Subject: [PATCH] Cleanup duplicate call (#522)
---
wrench/init.lua | 58 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 32 insertions(+), 26 deletions(-)
diff --git a/wrench/init.lua b/wrench/init.lua
index fbe1e10..adb80c9 100644
--- a/wrench/init.lua
+++ b/wrench/init.lua
@@ -24,10 +24,7 @@
local function get_meta_type(name, metaname)
local def = wrench.registered_nodes[name]
- if not def or not def.metas or not def.metas[metaname] then
- return nil
- end
- return def.metas[metaname]
+ return def and def.metas and def.metas[metaname] or nil
end
local function get_pickup_name(name)
@@ -36,14 +33,21 @@
local function restore(pos, placer, itemstack)
local name = itemstack:get_name()
+ local node = minetest.get_node(pos)
local meta = minetest.get_meta(pos)
local inv = meta:get_inventory()
- local data = minetest.deserialize(itemstack:get_metadata())
- minetest.set_node(pos, {name = data.name})
- local lists = data.lists
- for listname, list in pairs(lists) do
- inv:set_list(listname, list)
+ local data = itemstack:get_meta():get_string("data")
+ data = (data ~= "" and data) or itemstack:get_metadata()
+ data = minetest.deserialize(data)
+ if not data then
+ minetest.remove_node(pos)
+ minetest.log("error", placer:get_player_name().." wanted to place "..
+ name.." at "..minetest.pos_to_string(pos)..
+ ", but it had no data.")
+ minetest.log("verbose", "itemstack: "..itemstack:to_string())
+ return true
end
+ minetest.set_node(pos, {name = data.name, param2 = node.param2})
for name, value in pairs(data.metas) do
local meta_type = get_meta_type(data.name, name)
if meta_type == wrench.META_TYPE_INT then
@@ -53,6 +57,10 @@
elseif meta_type == wrench.META_TYPE_STRING then
meta:set_string(name, value)
end
+ end
+ local lists = data.lists
+ for listname, list in pairs(lists) do
+ inv:set_list(listname, list)
end
itemstack:take_item()
return itemstack
@@ -95,8 +103,9 @@
if not placer or not pos then
return
end
- if minetest.is_protected(pos, placer:get_player_name()) then
- minetest.record_protection_violation(pos, placer:get_player_name())
+ local player_name = placer:get_player_name()
+ if minetest.is_protected(pos, player_name) then
+ minetest.record_protection_violation(pos, player_name)
return
end
local name = minetest.get_node(pos).name
@@ -111,11 +120,11 @@
return
end
local meta = minetest.get_meta(pos)
- if def.owned then
+ if def.owned and not minetest.check_player_privs(placer, "protection_bypass") then
local owner = meta:get_string("owner")
- if owner and owner ~= placer:get_player_name() then
- minetest.log("action", placer:get_player_name()..
- " tried to pick up a owned node belonging to "..
+ if owner and owner ~= player_name then
+ minetest.log("action", player_name..
+ " tried to pick up an owned node belonging to "..
owner.." at "..
minetest.pos_to_string(pos))
return
@@ -129,9 +138,6 @@
local inv = meta:get_inventory()
local lists = {}
for _, listname in pairs(def.lists or {}) do
- if not inv:is_empty(listname) then
- empty = false
- end
local list = inv:get_list(listname)
for i, stack in pairs(list) do
list[i] = stack:to_string()
@@ -139,20 +145,20 @@
lists[listname] = list
end
metadata.lists = lists
-
- local metas = {}
+
+ local item_meta = stack:get_meta()
+ metadata.metas = {}
for name, meta_type in pairs(def.metas or {}) do
if meta_type == wrench.META_TYPE_INT then
- metas[name] = meta:get_int(name)
+ metadata.metas[name] = meta:get_int(name)
elseif meta_type == wrench.META_TYPE_FLOAT then
- metas[name] = meta:get_float(name)
+ metadata.metas[name] = meta:get_float(name)
elseif meta_type == wrench.META_TYPE_STRING then
- metas[name] = meta:get_string(name)
+ metadata.metas[name] = meta:get_string(name)
end
end
- metadata.metas = metas
-
- stack:set_metadata(minetest.serialize(metadata))
+
+ item_meta:set_string("data", minetest.serialize(metadata))
minetest.remove_node(pos)
itemstack:add_wear(65535 / 20)
player_inv:add_item("main", stack)
--
Gitblit v1.8.0