diff --git a/basis/fuel_lib.lua b/basis/fuel_lib.lua index 69b438e..d86bcb3 100644 --- a/basis/fuel_lib.lua +++ b/basis/fuel_lib.lua @@ -71,7 +71,7 @@ function techage.fuel.formspec(nvm) end function techage.fuel.can_dig(pos, player) - if minetest.is_protected(pos, player:get_player_name()) then + if not player or minetest.is_protected(pos, player:get_player_name()) then return false end local nvm = techage.get_nvm(pos) diff --git a/oil/pumpjack.lua b/oil/pumpjack.lua index 81200ab..eb70012 100644 --- a/oil/pumpjack.lua +++ b/oil/pumpjack.lua @@ -174,7 +174,17 @@ tiles.act = { local tubing = { on_recv_message = function(pos, src, topic, payload) - return CRD(pos).State:on_receive_message(pos, topic, payload) + if topic == "load" then + local storage_pos = M(pos):get_string("storage_pos") + if storage_pos ~= "" then + local amount, capa = techage.explore.get_oil_amount(P(storage_pos)) + if amount and capa and capa > 0 then + return techage.power.percent(capa or 0, amount or 0), amount or 0 + end + end + else + return CRD(pos).State:on_receive_message(pos, topic, payload) + end end, on_node_load = function(pos, node) CRD(pos).State:on_node_load(pos) diff --git a/ta3_power/akkubox.lua b/ta3_power/akkubox.lua index f5efc7a..3d7b662 100644 --- a/ta3_power/akkubox.lua +++ b/ta3_power/akkubox.lua @@ -167,7 +167,7 @@ minetest.register_node("techage:ta3_akku", { description = S("TA3 Accu Box"), tiles = { -- up, down, right, left, back, front - "techage_filling_ta3.png^techage_frame_ta3_top.png", + "techage_filling_ta3.png^techage_frame_ta3_top.png^techage_appl_arrow.png", "techage_filling_ta3.png^techage_frame_ta3.png", "techage_filling_ta3.png^techage_frame_ta3.png^techage_appl_hole_electric.png", "techage_filling_ta3.png^techage_frame_ta3.png^techage_appl_source.png",