From da95be53ec5703e808233d7b45fc42fb500863dd Mon Sep 17 00:00:00 2001 From: coil <51716565+coil0@users.noreply.github.com> Date: Mon, 30 Dec 2019 21:02:01 +0100 Subject: [PATCH] Fix radiation protection when armor group is not set (#509) --- technic/machines/register/common.lua | 72 ++++++++++++++++++++++++++++-------- 1 files changed, 56 insertions(+), 16 deletions(-) diff --git a/technic/machines/register/common.lua b/technic/machines/register/common.lua index 51747d8..38354f9 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 @@ -50,14 +66,14 @@ output_name = "dst" end - local meta = minetest.get_meta(pos) + local meta = minetest.get_meta(pos) local inv = meta:get_inventory() local i = 0 for _, stack in ipairs(inv:get_list(output_name)) do i = i + 1 if stack then local item0 = stack:to_table() - if item0 then + if item0 then item0["count"] = "1" technic.tube_inject_item(pos, pos, vector.new(x_velocity, 0, z_velocity), item0) stack:take_item(1) @@ -108,7 +124,7 @@ if node.param2 == 0 then pos1.x = pos1.x + 1 x_velocity = 1 end local output_tube_connected = false - local node1 = minetest.get_node(pos1) + local node1 = minetest.get_node(pos1) if minetest.get_item_group(node1.name, "tubedevice") > 0 then output_tube_connected = true 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