summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFaceDeer <derksenmobile@gmail.com>2017-10-15 00:44:12 -0600
committerFaceDeer <derksenmobile@gmail.com>2017-10-15 00:44:12 -0600
commit51b76e193db19a5c06f2a371a8300aeb5601a08f (patch)
treec525e04f70541d3c17a2f7fa2ed7d80a5f48f9fd
parent3bfabe8981fd2b491d27d7ac5e855165016f840c (diff)
restoring "emergency abort" functionality to auto-controller
-rw-r--r--class_layout.lua2
-rw-r--r--nodes/node_controllers.lua3
2 files changed, 3 insertions, 2 deletions
diff --git a/class_layout.lua b/class_layout.lua
index 83f3c8b..d18004a 100644
--- a/class_layout.lua
+++ b/class_layout.lua
@@ -12,7 +12,7 @@ local get_node_image = function(pos, node)
node_image.paramtype2 = node_def.paramtype2
local meta = minetest.get_meta(pos)
node_image.meta = meta:to_table()
- if node_image.meta ~= nil then
+ if node_image.meta ~= nil and node_def._digtron_formspec ~= nil then
node_image.meta.fields.formspec = node_def._digtron_formspec -- causes formspec to be automatically upgraded whenever Digtron moves
end
diff --git a/nodes/node_controllers.lua b/nodes/node_controllers.lua
index 4382734..e066f18 100644
--- a/nodes/node_controllers.lua
+++ b/nodes/node_controllers.lua
@@ -172,7 +172,8 @@ minetest.register_node("digtron:auto_controller", {
description = S("Digtron Automatic Control Module"),
_doc_items_longdesc = digtron.doc.auto_controller_longdesc,
_doc_items_usagehelp = digtron.doc.auto_controller_usagehelp,
- _digtron_formspec = auto_formspec,
+ --Don't set a _digtron_formspec for this node_def.
+ --Auto-controller has special formspec handling, while active it has no formspec and right-clicking interrupts it.
groups = {cracky = 3, oddly_breakable_by_hand = 3, digtron = 1},
drop = "digtron:auto_controller",
sounds = digtron.metal_sounds,