pumping bugfixes
This commit is contained in:
parent
c33bc5d11c
commit
7dadd2ca99
@ -281,11 +281,12 @@ minetest.register_node("techage:oilfirebox", {
|
||||
capa = oilburner.CAPACITY,
|
||||
peek = liquid.srv_peek,
|
||||
put = function(pos, indir, name, amount)
|
||||
liquid.srv_put(pos, indir, name, amount)
|
||||
local leftover = liquid.srv_put(pos, indir, name, amount)
|
||||
local mem = tubelib2.get_mem(pos)
|
||||
mem.liquid = mem.liquid or {}
|
||||
mem.liquid.amount = mem.liquid.amount or 0
|
||||
start_firebox2(pos, mem)
|
||||
return leftover
|
||||
end,
|
||||
take = liquid.srv_take,
|
||||
},
|
||||
|
@ -175,13 +175,7 @@ minetest.register_node("techage:furnace_firebox_on", {
|
||||
liquid = {
|
||||
capa = oilburner.CAPACITY,
|
||||
peek = liquid.srv_peek,
|
||||
put = function(pos, indir, name, amount)
|
||||
liquid.srv_put(pos, indir, name, amount)
|
||||
local mem = tubelib2.get_mem(pos)
|
||||
mem.liquid = mem.liquid or {}
|
||||
mem.liquid.amount = mem.liquid.amount or 0
|
||||
start_firebox(pos, mem)
|
||||
end,
|
||||
put = liquid.srv_put,
|
||||
take = liquid.srv_take,
|
||||
},
|
||||
networks = oilburner.networks,
|
||||
|
1
init.lua
1
init.lua
@ -216,6 +216,7 @@ else
|
||||
-- Chemistry
|
||||
--dofile(MP.."/chemistry/ta4_reactor.lua")
|
||||
--dofile(MP.."/chemistry/ta4_doser.lua")
|
||||
--dofile(MP.."/chemistry/ta4_distiller.lua")
|
||||
|
||||
-- Hydrogen
|
||||
dofile(MP.."/hydrogen/hydrogen.lua")
|
||||
|
@ -117,13 +117,13 @@ function techage.liquid.put(pos, outdir, name, amount)
|
||||
if liquid and liquid.put and liquid.peek then
|
||||
-- wrong items?
|
||||
local peek = liquid.peek(item.pos, item.indir)
|
||||
if peek and peek ~= name then return amount end
|
||||
if peek and peek ~= name then return amount or 0 end
|
||||
--techage.mark_position("singleplayer", item.pos, "put", "", 1) ------------------- debug
|
||||
amount = liquid.put(item.pos, item.indir, name, amount)
|
||||
if amount == 0 then break end
|
||||
if not amount or amount == 0 then break end
|
||||
end
|
||||
end
|
||||
return amount
|
||||
return amount or 0
|
||||
end
|
||||
|
||||
-- Take given amount of liquid for the remote inventory.
|
||||
@ -159,6 +159,7 @@ end
|
||||
function techage.liquid.srv_put(pos, indir, name, amount)
|
||||
local mem = tubelib2.get_mem(pos)
|
||||
mem.liquid = mem.liquid or {}
|
||||
amount = amount or 0
|
||||
if not mem.liquid.name then
|
||||
mem.liquid.name = name
|
||||
mem.liquid.amount = amount
|
||||
@ -181,6 +182,7 @@ end
|
||||
function techage.liquid.srv_take(pos, indir, name, amount)
|
||||
local mem = tubelib2.get_mem(pos)
|
||||
mem.liquid = mem.liquid or {}
|
||||
amount = amount or 0
|
||||
if not name or mem.liquid.name == name then
|
||||
name = mem.liquid.name
|
||||
mem.liquid.amount = mem.liquid.amount or 0
|
||||
|
@ -105,7 +105,7 @@ local function allow_metadata_inventory_put(pos, listname, index, stack, player)
|
||||
if minetest.is_protected(pos, player:get_player_name()) then
|
||||
return 0
|
||||
end
|
||||
return 1
|
||||
return stack:get_count()
|
||||
end
|
||||
|
||||
local function allow_metadata_inventory_take(pos, listname, index, stack, player)
|
||||
|
Binary file not shown.
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 23 KiB |
Loading…
Reference in New Issue
Block a user