From 6154a04c00d7650664b78e2bca37631ae3778411 Mon Sep 17 00:00:00 2001
From: David Leal <halfpacho@gmail.com>
Date: Wed, 24 Jun 2020 21:14:04 +0200
Subject: [PATCH] Remove node_ownership support, cleanup (#560)
---
technic/machines/HV/quarry.lua | 39 +++++++++++++++++++++++----------------
1 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/technic/machines/HV/quarry.lua b/technic/machines/HV/quarry.lua
index 131ba42..9cf378f 100644
--- a/technic/machines/HV/quarry.lua
+++ b/technic/machines/HV/quarry.lua
@@ -2,11 +2,12 @@
local S = technic.getter
local tube_entry = "^pipeworks_tube_connection_metallic.png"
+local cable_entry = "^technic_cable_connection_overlay.png"
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",
})
@@ -59,6 +60,12 @@
end
local function quarry_receive_fields(pos, formname, fields, sender)
+ local player_name = sender:get_player_name()
+ if minetest.is_protected(pos, player_name) then
+ minetest.chat_send_player(player_name, "You are not allowed to edit this!")
+ minetest.record_protection_violation(pos, player_name)
+ return
+ end
local meta = minetest.get_meta(pos)
if fields.size and string.find(fields.size, "^[0-9]+$") then
local size = tonumber(fields.size)
@@ -111,6 +118,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
@@ -121,18 +133,9 @@
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
+ while nd < diameter*diameter * (quarry_dig_above_nodes+1+quarry_max_depth) do
local ry = math.floor(nd / (diameter*diameter))
local ndl = nd % (diameter*diameter)
if ry % 2 == 1 then
@@ -153,7 +156,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
@@ -211,11 +218,11 @@
description = S("%s Quarry"):format("HV"),
tiles = {
"technic_carbon_steel_block.png"..tube_entry,
- "technic_carbon_steel_block.png",
- "technic_carbon_steel_block.png",
- "technic_carbon_steel_block.png",
+ "technic_carbon_steel_block.png"..cable_entry,
+ "technic_carbon_steel_block.png"..cable_entry,
+ "technic_carbon_steel_block.png"..cable_entry,
"technic_carbon_steel_block.png^default_tool_mesepick.png",
- "technic_carbon_steel_block.png"
+ "technic_carbon_steel_block.png"..cable_entry
},
paramtype2 = "facedir",
groups = {cracky=2, tubedevice=1, technic_machine=1, technic_hv=1},
--
Gitblit v1.8.0