minetest-mods/technic
1
0
Fork 1
mirror of https://github.com/minetest-mods/technic.git synced 2024-12-24 18:00:29 +01:00
Code Issues Releases Wiki Activity

Merge pull request #298 from t4im/fix/quarry_loops

Browse Source 
Mitigate server freezes due to item-transportation loops with quarries.
This commit is contained in:
Vanessa Ezekowitz 2017-03-06 14:11:40 -05:00 committed by GitHub
commit 32b6ca9816
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
technic/machines/HV/quarry.lua
View File

@ -12,6 +12,7 @@ minetest.register_craft({
local quarry_dig_above_nodes = 3 -- How far above the quarry we will dig nodes local quarry_dig_above_nodes = 3 -- How far above the quarry we will dig nodes
local quarry_max_depth = 100 local quarry_max_depth = 100
local quarry_demand = 10000 local quarry_demand = 10000
local quarry_eject_dir = vector.new(0, 1, 0)
local function set_quarry_formspec(meta) local function set_quarry_formspec(meta)
local radius = meta:get_int("size") local radius = meta:get_int("size")
@ -83,7 +84,7 @@ local function quarry_handle_purge(pos)
if stack then if stack then
local item = stack:to_table() local item = stack:to_table()
if item then if item then
technic.tube_inject_item(pos, pos, vector.new(0, 1, 0), item) technic.tube_inject_item(pos, pos, quarry_eject_dir, item)
stack:clear() stack:clear()
inv:set_stack("cache", i, stack) inv:set_stack("cache", i, stack)
break break
@ -217,6 +218,16 @@ minetest.register_node("technic:quarry", {
connect_sides = {"bottom", "front", "left", "right"}, connect_sides = {"bottom", "front", "left", "right"},
tube = { tube = {
connect_sides = {top = 1}, connect_sides = {top = 1},
-- lower priority than other tubes, so that quarries will prefer any
-- other tube to another quarry, which could lead to server freezes
-- in certain quarry placements (2x2 for example would never eject)
priority = 10,
can_go = function(pos, node, velocity, stack)
-- always eject the same, even if items came in another way
-- this further mitigates loops and generally avoids random sideway movement
-- that can be expected in certain quarry placements
return { quarry_eject_dir }
end
}, },
on_construct = function(pos) on_construct = function(pos)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)