From 701240bc3a17a73d73f3a96cd81e559d662ac42c Mon Sep 17 00:00:00 2001
From: Thomas Rudin <thomas@rudin.li>
Date: Sun, 09 Dec 2018 16:01:10 +0100
Subject: [PATCH] Quarry: Check for valid facedir to fix server freeze #465 (#466)
---
technic/machines/HV/quarry.lua | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/technic/machines/HV/quarry.lua b/technic/machines/HV/quarry.lua
index c1ee1bb..b6f9c14 100644
--- a/technic/machines/HV/quarry.lua
+++ b/technic/machines/HV/quarry.lua
@@ -7,7 +7,7 @@
minetest.register_craft({
recipe = {
{"technic:carbon_plate", "pipeworks:filter", "technic:composite_plate"},
- {"technic:motor", "technic:machine_casing", "technic:diamond_drill_head"},
+ {"basic_materials:motor", "technic:machine_casing", "technic:diamond_drill_head"},
{"technic:carbon_steel_block", "technic:hv_cable", "technic:carbon_steel_block"}},
output = "technic:quarry",
})
@@ -112,6 +112,11 @@
if meta:get_int("enabled") and meta:get_int("HV_EU_input") >= quarry_demand and meta:get_int("purge_on") == 0 then
local pdir = minetest.facedir_to_dir(node.param2)
+ if pdir.y ~= 0 then
+ -- faces up or down, not valid, otherwise depth-check would run endless and hang up the server
+ return
+ end
+
local qdir = pdir.x == 1 and vector.new(0,0,-1) or
(pdir.z == -1 and vector.new(-1,0,0) or
(pdir.x == -1 and vector.new(0,0,1) or
@@ -122,15 +127,6 @@
vector.new(0, quarry_dig_above_nodes, 0)),
pdir),
vector.multiply(qdir, -radius))
- local endpos = vector.add(vector.add(vector.add(startpos,
- vector.new(0, -quarry_dig_above_nodes-quarry_max_depth, 0)),
- vector.multiply(pdir, diameter-1)),
- vector.multiply(qdir, diameter-1))
- local vm = VoxelManip()
- local minpos, maxpos = vm:read_from_map(startpos, endpos)
- local area = VoxelArea:new({MinEdge=minpos, MaxEdge=maxpos})
- local data = vm:get_data()
- local c_air = minetest.get_content_id("air")
local owner = meta:get_string("owner")
local nd = meta:get_int("dug")
while nd ~= diameter*diameter * (quarry_dig_above_nodes+1+quarry_max_depth) do
@@ -154,7 +150,11 @@
if can_dig then
dignode = technic.get_or_load_node(digpos) or minetest.get_node(digpos)
local dignodedef = minetest.registered_nodes[dignode.name] or {diggable=false}
- if not dignodedef.diggable or (dignodedef.can_dig and not dignodedef.can_dig(digpos, nil)) then
+ -- doors mod among other thing does NOT like a nil digger...
+ local fakedigger = pipeworks.create_fake_player({
+ name = owner
+ })
+ if not dignodedef.diggable or (dignodedef.can_dig and not dignodedef.can_dig(digpos, fakedigger)) then
can_dig = false
end
end
--
Gitblit v1.8.0