Mirrorlandia_minetest/techpack
1
0
Fork 0
mirror of https://github.com/joe7575/techpack.git synced 2024-11-26 09:03:46 +01:00
Code Issues Projects Releases Wiki Activity

issue #48 fixed

Browse Source
This commit is contained in:
Joachim Stolberg 2020-07-21 17:12:54 +02:00
parent 9a7317541a
commit ef9967a6ed
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
releasenotes.md
View File

@ -2,7 +2,20 @@
## V2.03.10 (2020-06-96) ## V2.03.11 (2020-07-21)
### Additions
### Removals
### Changes
### Fixes
- SaferLua Controller comments bugfix (issue #48)
- SmartLine Controller bugfix
## V2.03.10 (2020-06-06)
### Additions ### Additions

2
safer_lua/scanner.lua
View File

@ -56,7 +56,7 @@ function safer_lua:scanner(text)
self.line = line self.line = line
self.pos = 1 self.pos = 1
self.line = trim(self.line) self.line = trim(self.line)
self.line = self.line:split("--")[1] self.line = string.split(self.line, "--", true, 1)[1]
table.insert(lToken, idx) -- line number table.insert(lToken, idx) -- line number
if self.line then if self.line then
-- devide line in tokens -- devide line in tokens

5
smartline/icta/commands.lua
View File

@ -37,6 +37,7 @@ end
-- '#' is used as placeholder for rule numbers and has to be escaped -- '#' is used as placeholder for rule numbers and has to be escaped
function smartline.escape(s) function smartline.escape(s)
s = tostring(s) s = tostring(s)
s = s:gsub('"', '\\"') -- to prevent code injection!!!
return s:gsub("#", '"..string.char(35).."') return s:gsub("#", '"..string.char(35).."')
end end
@ -431,7 +432,7 @@ smartline.icta_register_action("chat", {
}, },
}, },
code = function(data, environ) code = function(data, environ)
return 'minetest.chat_send_player("'..environ.owner..'", "[SmartLine Controller] '..data.text..'")' return 'minetest.chat_send_player("'..environ.owner..'", "[SmartLine Controller] '..smartline.escape(data.text)..'")'
end, end,
button = function(data, environ) button = function(data, environ)
return 'chat("'..data.text:sub(1,12)..'")' return 'chat("'..data.text:sub(1,12)..'")'
@ -518,7 +519,7 @@ smartline.icta_register_condition("playerdetector", {
}, },
code = function(data, environ) code = function(data, environ)
return 'smartline.icta_player_detect("'..data.number..'", "'..data.name..'")', "~= nil" return 'smartline.icta_player_detect("'..data.number..'", "'..smartline.escape(data.name)..'")', "~= nil"
end, end,
button = function(data, environ) button = function(data, environ)
return "detector("..sl.fmt_number(data.number)..","..data.name:sub(1,8)..")" return "detector("..sl.fmt_number(data.number)..","..data.name:sub(1,8)..")"