diff --git a/mesecons/util.lua b/mesecons/util.lua
index 7485cac132751ffc6fd871c5062ea03e58980f44..f1f88d6751abac8cda5db6cc5d176b1e804f3e5c 100644
--- a/mesecons/util.lua
+++ b/mesecons/util.lua
@@ -193,14 +193,23 @@ function mesecon.tablecopy(obj) -- deep copy
return obj
end
+-- Returns whether two values are equal.
+-- In tables, keys are compared for identity but values are compared recursively.
+-- There is no protection from infinite recursion.
function mesecon.cmpAny(t1, t2)
if type(t1) ~= type(t2) then return false end
- if type(t1) ~= "table" and type(t2) ~= "table" then return t1 == t2 end
+ if type(t1) ~= "table" then return t1 == t2 end
+ -- Check that for each key of `t1` both tables have the same value
for i, e in pairs(t1) do
if not mesecon.cmpAny(e, t2[i]) then return false end
end
+ -- Check that all keys of `t2` are also keys of `t1` so were checked in the previous loop
+ for i, _ in pairs(t2) do
+ if t1[i] == nil then return false end
+ end
+
return true
end
diff --git a/mesecons_doors/init.lua b/mesecons_doors/init.lua
index cf6faeb19307644f81203bd3d0d9f88e7a4931f5..0f7bea7157e98003834ce16fa64e6a30962ae2e2 100644
--- a/mesecons_doors/init.lua
+++ b/mesecons_doors/init.lua
@@ -73,6 +73,7 @@ meseconify_door("doors:door_wood")
meseconify_door("doors:door_steel")
meseconify_door("doors:door_glass")
meseconify_door("doors:door_obsidian_glass")
+meseconify_door("xpanes:door_steel_bar")
-- Trapdoor
local function trapdoor_switch(pos, node)
@@ -110,6 +111,12 @@ if doors and doors.get then
minetest.override_item("doors:trapdoor_open", override)
minetest.override_item("doors:trapdoor_steel", override)
minetest.override_item("doors:trapdoor_steel_open", override)
+
+ if minetest.registered_items["xpanes:trapdoor_steel_bar"] then
+ minetest.override_item("xpanes:trapdoor_steel_bar", override)
+ minetest.override_item("xpanes:trapdoor_steel_bar_open", override)
+ end
+
else
if minetest.registered_nodes["doors:trapdoor"] then
minetest.override_item("doors:trapdoor", {
diff --git a/mesecons_doors/mod.conf b/mesecons_doors/mod.conf
index da12b38ee075b6fad0c739633f0eff656ab82ab7..4daab3479400daffdcaac4a37b2925fa3b840f81 100644
--- a/mesecons_doors/mod.conf
+++ b/mesecons_doors/mod.conf
@@ -1,2 +1,3 @@
name = mesecons_doors
depends = mesecons, doors
+optional_depends = xpanes
diff --git a/mesecons_luacontroller/init.lua b/mesecons_luacontroller/init.lua
index 1c93e48c9c5937cd0071e409424eb5ccdaf6309d..1c411dd20b2c6b1d0eb5546577e9676e0c4c8014 100644
--- a/mesecons_luacontroller/init.lua
+++ b/mesecons_luacontroller/init.lua
@@ -266,6 +266,46 @@ local function remove_functions(x)
return x
end
+local function validate_iid(iid)
+ if not iid then return true end -- nil is OK
+
+ local limit = mesecon.setting("luacontroller_interruptid_maxlen", 256)
+ if type(iid) == "string" then
+ if #iid <= limit then return true end -- string is OK unless too long
+ return false, "An interrupt ID was too large!"
+ end
+ if type(iid) == "number" or type(iid) == "boolean" then return true, "Non-string interrupt IDs are deprecated" end
+
+ local warn
+ local seen = {}
+ local function check(t)
+ if type(t) == "function" then
+ warn = "Functions cannot be used in interrupt IDs"
+ return false
+ end
+ if type(t) ~= "table" then
+ return true
+ end
+ if seen[t] then
+ warn = "Non-tree-like tables are forbidden as interrupt IDs"
+ return false
+ end
+ seen[t] = true
+ for k, v in pairs(t) do
+ if not check(k) then return false end
+ if not check(v) then return false end
+ end
+ return true
+ end
+ if not check(iid) then return false, warn end
+
+ if #minetest.serialize(iid) > limit then
+ return false, "An interrupt ID was too large!"
+ end
+
+ return true, "Table interrupt IDs are deprecated and are unreliable; use strings instead"
+end
+
-- The setting affects API so is not intended to be changeable at runtime
local get_interrupt
if mesecon.setting("luacontroller_lightweight_interrupts", false) then
@@ -282,26 +322,18 @@ else
-- itbl: Flat table of functions to run after sandbox cleanup, used to prevent various security hazards
get_interrupt = function(pos, itbl, send_warning)
-- iid = interrupt id
- local function interrupt(time, iid)
+ return function (time, iid)
-- NOTE: This runs within string metatable sandbox, so don't *rely* on anything of the form (""):y
-- Hence the values get moved out. Should take less time than original, so totally compatible
if type(time) ~= "number" then error("Delay must be a number") end
table.insert(itbl, function ()
-- Outside string metatable sandbox, can safely run this now
local luac_id = minetest.get_meta(pos):get_int("luac_id")
- -- Check if IID is dodgy, so you can't use interrupts to store an infinite amount of data.
- -- Note that this is safe from alter-after-free because this code gets run after the sandbox has ended.
- -- This runs outside of the timer and *shouldn't* harm perf. unless dodgy data is being sent in the first place
- iid = remove_functions(iid)
- local msg_ser = minetest.serialize(iid)
- if #msg_ser <= mesecon.setting("luacontroller_interruptid_maxlen", 256) then
- mesecon.queue:add_action(pos, "lc_interrupt", {luac_id, iid}, time, iid, 1)
- else
- send_warning("An interrupt ID was too large!")
- end
+ local ok, warn = validate_iid(iid)
+ if ok then mesecon.queue:add_action(pos, "lc_interrupt", {luac_id, iid}, time, iid, 1) end
+ if warn then send_warning(warn) end
end)
end
- return interrupt
end
end
@@ -632,6 +664,7 @@ local function reset_formspec(meta, code, errmsg)
code = minetest.formspec_escape(code or "")
errmsg = minetest.formspec_escape(tostring(errmsg or ""))
meta:set_string("formspec", "size[12,10]"
+ .."style_type[label,textarea;font=mono]"
.."background[-0.2,-0.25;12.4,10.75;jeija_luac_background.png]"
.."label[0.1,8.3;"..errmsg.."]"
.."textarea[0.2,0.2;12.2,9.5;code;;"..code.."]"
@@ -901,4 +934,3 @@ minetest.register_craft({
{'group:mesecon_conductor_craftable', 'group:mesecon_conductor_craftable', ''},
}
})
-
diff --git a/mesecons_noteblock/init.lua b/mesecons_noteblock/init.lua
index b4e7d24c1f5593940bca34485f71c9efba81c826..577cee0895b9c90a618b87ac26aa8ee282a1aa41 100644
--- a/mesecons_noteblock/init.lua
+++ b/mesecons_noteblock/init.lua
@@ -3,7 +3,11 @@ minetest.register_node("mesecons_noteblock:noteblock", {
tiles = {"mesecons_noteblock.png"},
is_ground_content = false,
groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2},
- on_punch = function(pos, node) -- change sound when punched
+ on_punch = function(pos, node, puncher) -- change sound when punched
+ if minetest.is_protected(pos, puncher and puncher:get_player_name()) then
+ return
+ end
+
node.param2 = (node.param2+1)%12
mesecon.noteblock_play(pos, node.param2)
minetest.set_node(pos, node)
@@ -81,5 +85,11 @@ mesecon.noteblock_play = function(pos, param2)
end
end
pos.y = pos.y+1
- minetest.sound_play(soundname, { pos = pos }, true)
+ if soundname == "fire_fire" then
+ -- Smoothly fade out fire sound
+ local handle = minetest.sound_play(soundname, {pos = pos, loop = true})
+ minetest.after(3.0, minetest.sound_fade, handle, -1.5, 0.0)
+ else
+ minetest.sound_play(soundname, {pos = pos}, true)
+ end
end