mirror of
https://github.com/minetest-mods/mesecons.git
synced 2025-07-01 23:30:21 +02:00
Minor fix in detectors
This commit is contained in:
@ -32,22 +32,19 @@ local function object_detector_scan(pos)
|
|||||||
|
|
||||||
local scanname = minetest.get_meta(pos):get_string("scanname")
|
local scanname = minetest.get_meta(pos):get_string("scanname")
|
||||||
local sep = "," -- Begin code to split scanname into array
|
local sep = "," -- Begin code to split scanname into array
|
||||||
local t={}
|
local scan_for = {}
|
||||||
for str in string.gmatch(scanname, "([^"..sep.."]+)") do
|
for str in string.gmatch(scanname, "([^"..sep.."]+)") do
|
||||||
t[str:gsub("%s+", "")] = true
|
scan_for[str:gsub("%s+", "")] = true
|
||||||
end -- end split code
|
end -- end split code
|
||||||
local every_player = scanname == ""
|
local every_player = scanname == ""
|
||||||
for _, obj in pairs(objs) do
|
for _, obj in pairs(objs) do
|
||||||
-- "" is returned if it is not a player; "" ~= nil; so only handle objects with foundname ~= ""
|
-- "" is returned if it is not a player; "" ~= nil; so only handle objects with foundname ~= ""
|
||||||
local foundname = obj:get_player_name()
|
local foundname = obj:get_player_name()
|
||||||
|
|
||||||
if foundname ~= "" then
|
if foundname ~= "" then
|
||||||
for _ in pairs(t) do
|
if every_player or scan_for[foundname] then
|
||||||
if t[foundname] then return true end
|
return true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
if scanname == "" then return true end -- Return true if no player name was specified
|
|
||||||
end
|
end
|
||||||
|
|
||||||
return false
|
return false
|
||||||
@ -143,7 +140,6 @@ local function node_detector_make_formspec(pos)
|
|||||||
"field[0.3,1.5;2,2;distance;Distance (0-10):;${distance}]"..
|
"field[0.3,1.5;2,2;distance;Distance (0-10):;${distance}]"..
|
||||||
"field[2.5,1.5;4,2;digiline_channel;Digiline Channel (optional):;${digiline_channel}]"..
|
"field[2.5,1.5;4,2;digiline_channel;Digiline Channel (optional):;${digiline_channel}]"..
|
||||||
"button_exit[7,0.75;2,3;;Save]")
|
"button_exit[7,0.75;2,3;;Save]")
|
||||||
if not meta:get_string("owner") then meta:set_string("owner", "") end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
local function node_detector_on_receive_fields(pos, fieldname, fields, sender)
|
local function node_detector_on_receive_fields(pos, fieldname, fields, sender)
|
||||||
@ -222,7 +218,6 @@ local function after_place_node_detector(pos, placer)
|
|||||||
if placer then
|
if placer then
|
||||||
minetest.get_meta(pos):set_string("owner", placer:get_player_name())
|
minetest.get_meta(pos):set_string("owner", placer:get_player_name())
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
minetest.register_node("mesecons_detector:node_detector_off", {
|
minetest.register_node("mesecons_detector:node_detector_off", {
|
||||||
|
Reference in New Issue
Block a user