From 10307f23a78b33af50dc4a5f3d1baafb4ee4b0d9 Mon Sep 17 00:00:00 2001
From: Maciej 'agaran' Pijanka <agaran@pld-linux.org>
Date: Thu, 16 Mar 2017 00:00:22 +0100
Subject: [PATCH] Do not run converters twice.
---
technic/machines/register/common.lua | 66 ++++++++++++++++++++++++++------
1 files changed, 53 insertions(+), 13 deletions(-)
diff --git a/technic/machines/register/common.lua b/technic/machines/register/common.lua
index 51747d8..dfa2948 100644
--- a/technic/machines/register/common.lua
+++ b/technic/machines/register/common.lua
@@ -34,12 +34,28 @@
-- handles the machine upgrades when set or removed
local function on_machine_upgrade(meta, stack)
- local stack_name = stack and stack:get_name()
- if stack_name ~= "technic:control_logic_unit"
- and stack_name ~= "technic:battery" then
+ local stack_name = stack:get_name()
+ if stack_name == "default:chest" then
+ meta:set_int("public", 1)
+ return 1
+ elseif stack_name ~= "technic:control_logic_unit"
+ and stack_name ~= "technic:battery" then
return 0
end
+ return 1
+end
+-- something is about to be removed
+local function on_machine_downgrade(meta, stack, list)
+ if stack:get_name() == "default:chest" then
+ local inv = meta:get_inventory()
+ local upg1, upg2 = inv:get_stack("upgrade1", 1), inv:get_stack("upgrade2", 1)
+
+ -- only set 0 if theres not a nother chest in the other list too
+ if (not upg1 or not upg2 or upg1:get_name() ~= upg2:get_name()) then
+ meta:set_int("public", 0)
+ end
+ end
return 1
end
@@ -122,38 +138,62 @@
meta:set_int("tube_time", tube_time)
end
-
function technic.machine_can_dig(pos, player)
local meta = minetest.get_meta(pos)
local inv = meta:get_inventory()
- if not inv:is_empty("src") or not inv:is_empty("dst") or
- not inv:is_empty("upgrade1") or not inv:is_empty("upgrade2") then
+ if not inv:is_empty("src") or not inv:is_empty("dst") then
if player then
minetest.chat_send_player(player:get_player_name(),
S("Machine cannot be removed because it is not empty"))
end
return false
- else
- return true
+ end
+
+ return true
+end
+
+function technic.machine_after_dig_node(pos, oldnode, oldmetadata, player)
+ if oldmetadata.inventory then
+ if oldmetadata.inventory.upgrade1 and oldmetadata.inventory.upgrade1[1] then
+ local stack = ItemStack(oldmetadata.inventory.upgrade1[1])
+ if not stack:is_empty() then
+ minetest.add_item(pos, stack)
+ end
+ end
+ if oldmetadata.inventory.upgrade2 and oldmetadata.inventory.upgrade2[1] then
+ local stack = ItemStack(oldmetadata.inventory.upgrade2[1])
+ if not stack:is_empty() then
+ minetest.add_item(pos, stack)
+ end
+ end
+ end
+
+ if minetest.registered_nodes[oldnode.name].tube then
+ pipeworks.after_dig(pos, oldnode, oldmetadata, player)
end
end
local function inv_change(pos, player, count, from_list, to_list, stack)
local playername = player:get_player_name()
- if minetest.is_protected(pos, playername) then
+ local meta = minetest.get_meta(pos);
+ local public = (meta:get_int("public") == 1)
+ local to_upgrade = to_list == "upgrade1" or to_list == "upgrade2"
+ local from_upgrade = from_list == "upgrade1" or from_list == "upgrade2"
+
+ if (not public or to_upgrade or from_upgrade) and minetest.is_protected(pos, playername) then
minetest.chat_send_player(playername, S("Inventory move disallowed due to protection"))
return 0
end
- if to_list == "upgrade1" or to_list == "upgrade2" then
+ if to_upgrade then
-- only place a single item into it, if it's empty
- local meta = minetest.get_meta(pos);
local empty = meta:get_inventory():is_empty(to_list)
if empty then
return on_machine_upgrade(meta, stack)
end
return 0
- elseif from_list == "upgrade1" or from_list == "upgrade2" then
- on_machine_upgrade(meta, nil)
+ elseif from_upgrade then
+ -- only called on take (not move)
+ on_machine_downgrade(meta, stack, from_list)
end
return count
end
--
Gitblit v1.8.0