diff options
| author | Vanessa Dannenberg <vanessa.e.dannenberg@gmail.com> | 2018-12-17 02:20:30 -0500 |
|---|---|---|
| committer | Vanessa Dannenberg <vanessa.e.dannenberg@gmail.com> | 2018-12-17 02:20:30 -0500 |
| commit | ec25fd83415d0ecb49f41295af3dc30f14850b2f (patch) | |
| tree | 59fe699656e75a52e6665b385907b86cc0b89c16 /technic/machines/HV | |
| parent | 856b86858ebfa4af2c352b022188f82dcff7ed92 (diff) | |
| download | dreambuilder_modpack-ec25fd83415d0ecb49f41295af3dc30f14850b2f.tar dreambuilder_modpack-ec25fd83415d0ecb49f41295af3dc30f14850b2f.tar.gz dreambuilder_modpack-ec25fd83415d0ecb49f41295af3dc30f14850b2f.tar.bz2 dreambuilder_modpack-ec25fd83415d0ecb49f41295af3dc30f14850b2f.tar.xz dreambuilder_modpack-ec25fd83415d0ecb49f41295af3dc30f14850b2f.zip | |
update biome_lib, digilines, hotbar, mesecons, pipeworks,
ropes, technic, unified inventory, unified dyes, vines, and worldedit
Diffstat (limited to 'technic/machines/HV')
| -rw-r--r-- | technic/machines/HV/forcefield.lua | 11 | ||||
| -rw-r--r-- | technic/machines/HV/quarry.lua | 5 |
2 files changed, 7 insertions, 9 deletions
diff --git a/technic/machines/HV/forcefield.lua b/technic/machines/HV/forcefield.lua index 230c8b0..7395284 100644 --- a/technic/machines/HV/forcefield.lua +++ b/technic/machines/HV/forcefield.lua @@ -42,7 +42,7 @@ end) -- | | -- \___/\___/ -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 @@ local function update_forcefield(pos, meta, active, first) 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) @@ -273,13 +268,11 @@ local function run(pos, node) 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 diff --git a/technic/machines/HV/quarry.lua b/technic/machines/HV/quarry.lua index 0a45559..b6f9c14 100644 --- a/technic/machines/HV/quarry.lua +++ b/technic/machines/HV/quarry.lua @@ -112,6 +112,11 @@ local function quarry_run(pos, node) 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 |