From bb05ff8fd210fc9fac0b521f15e755380e6916d3 Mon Sep 17 00:00:00 2001
From: coil <51716565+coil0@users.noreply.github.com>
Date: Sun, 21 Jul 2019 12:40:57 +0200
Subject: [PATCH] Reject constructor in constructor slot inventories (#505)
---
technic/machines/HV/forcefield.lua | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/technic/machines/HV/forcefield.lua b/technic/machines/HV/forcefield.lua
index 157dc33..29c023d 100644
--- a/technic/machines/HV/forcefield.lua
+++ b/technic/machines/HV/forcefield.lua
@@ -17,7 +17,7 @@
minetest.register_craft({
output = "technic:forcefield_emitter_off",
recipe = {
- {"default:mese", "technic:motor", "default:mese" },
+ {"default:mese", "basic_materials:motor", "default:mese" },
{"technic:deployer_off", "technic:machine_casing", "technic:deployer_off"},
{"default:mese", "technic:hv_cable", "default:mese" },
}
@@ -42,7 +42,7 @@
-- | |
-- \___/\___/
-local function update_forcefield(pos, meta, active, first)
+local function update_forcefield(pos, meta, active)
local shape = meta:get_int("shape")
local range = meta:get_int("range")
local vm = VoxelManip()
@@ -86,11 +86,6 @@
vm:set_data(data)
vm:update_liquids()
vm:write_to_map()
- -- update_map is very slow, but if we don't call it we'll
- -- get phantom blocks on the client.
- if not active or first then
- vm:update_map()
- end
end
local function set_forcefield_formspec(meta)
@@ -126,6 +121,12 @@
end
local forcefield_receive_fields = function(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)
local range = nil
if fields.range then
@@ -273,13 +274,11 @@
technic.swap_node(pos, "technic:forcefield_emitter_off")
end
elseif eu_input >= power_requirement then
- local first = false
if node.name == "technic:forcefield_emitter_off" then
- first = true
technic.swap_node(pos, "technic:forcefield_emitter_on")
meta:set_string("infotext", S("%s Active"):format(machine_name))
end
- update_forcefield(pos, meta, true, first)
+ update_forcefield(pos, meta, true)
end
end
--
Gitblit v1.8.0