From 167ab93905a8206be2a5f4d9619c4b9f710bb211 Mon Sep 17 00:00:00 2001
From: SmallJoker <mk939@ymail.com>
Date: Tue, 14 Jun 2022 20:49:21 +0200
Subject: [PATCH] Maintenance: Remove depends.txt and error on old MT versions
---
technic/machines/HV/quarry.lua | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/technic/machines/HV/quarry.lua b/technic/machines/HV/quarry.lua
index 0a45559..1bf1ad6 100644
--- a/technic/machines/HV/quarry.lua
+++ b/technic/machines/HV/quarry.lua
@@ -47,19 +47,30 @@
local radius = meta:get_int("size")
local diameter = radius*2 + 1
local machine_name = S("%s Quarry"):format("HV")
- if meta:get_int("enabled") == 0 or meta:get_int("purge_on") == 1 then
- meta:set_string("infotext", S(meta:get_int("purge_on") == 1 and "%s purging cache" or "%s Disabled"):format(machine_name))
+ local do_purge = meta:get_int("purge_on") == 1
+ if meta:get_int("enabled") == 0 or do_purge then
+ local infotext = do_purge and
+ S("%s purging cache") or S("%s Disabled")
+ meta:set_string("infotext", infotext:format(machine_name))
meta:set_int("HV_EU_demand", 0)
elseif meta:get_int("dug") == diameter*diameter * (quarry_dig_above_nodes+1+quarry_max_depth) then
meta:set_string("infotext", S("%s Finished"):format(machine_name))
meta:set_int("HV_EU_demand", 0)
else
- meta:set_string("infotext", S(meta:get_int("HV_EU_input") >= quarry_demand and "%s Active" or "%s Unpowered"):format(machine_name))
+ local infotext = meta:get_int("HV_EU_input") >= quarry_demand
+ and S("%s Active") or S("%s Unpowered")
+ meta:set_string("infotext", infotext:format(machine_name))
meta:set_int("HV_EU_demand", quarry_demand)
end
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)
@@ -112,6 +123,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
@@ -124,7 +140,7 @@
vector.multiply(qdir, -radius))
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
--
Gitblit v1.8.0