Skip to content

Commit 84c42ce

Browse files
committed
sanitize coords from digilines and fleet formspec
1 parent 8aff0cc commit 84c42ce

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

digiline.lua

+6-6
Original file line numberDiff line numberDiff line change
@@ -57,21 +57,21 @@ jumpdrive.digiline_effector = function(pos, _, channel, msg)
5757
end
5858
-- backward compatibility with old less flexible set command
5959
if msg.key == "x" then
60-
meta:set_int("x", value)
60+
meta:set_int("x", jumpdrive.sanitize_coord(value))
6161
elseif msg.key == "y" then
62-
meta:set_int("y", value)
62+
meta:set_int("y", jumpdrive.sanitize_coord(value))
6363
elseif msg.key == "z" then
64-
meta:set_int("z", value)
64+
meta:set_int("z", jumpdrive.sanitize_coord(value))
6565
elseif msg.key == "radius" then
6666
if value >= 1 and value <= jumpdrive.config.max_radius then
6767
meta:set_int("radius", value)
6868
end
6969
end
7070
else
7171
-- API requires integers for coord values, noop for everything else
72-
if is_int(msg.x) then meta:set_int("x", msg.x) end
73-
if is_int(msg.y) then meta:set_int("y", msg.y) end
74-
if is_int(msg.z) then meta:set_int("z", msg.z) end
72+
if is_int(msg.x) then meta:set_int("x", jumpdrive.sanitize_coord(msg.x)) end
73+
if is_int(msg.y) then meta:set_int("y", jumpdrive.sanitize_coord(msg.y)) end
74+
if is_int(msg.z) then meta:set_int("z", jumpdrive.sanitize_coord(msg.z)) end
7575
if is_int(msg.r) and msg.r <= jumpdrive.config.max_radius then
7676
meta:set_int("radius", msg.r)
7777
end

fleet/fleet_controller.lua

+3-3
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,9 @@ minetest.register_node("jumpdrive:fleet_controller", {
101101
end
102102

103103
-- update coords
104-
meta:set_int("x", x)
105-
meta:set_int("y", y)
106-
meta:set_int("z", z)
104+
meta:set_int("x", jumpdrive.sanitize_coord(x))
105+
meta:set_int("y", jumpdrive.sanitize_coord(y))
106+
meta:set_int("z", jumpdrive.sanitize_coord(z))
107107
jumpdrive.fleet.update_formspec(meta, pos)
108108

109109
local t0 = minetest.get_us_time()

fleet/fleet_digiline.lua

+3-3
Original file line numberDiff line numberDiff line change
@@ -251,9 +251,9 @@ jumpdrive.fleet.digiline_effector = function(pos, _, channel, msg)
251251
end
252252

253253
-- API requires integers for coord values, noop for everything else
254-
if is_int(msg.x) then meta:set_int("x", msg.x) end
255-
if is_int(msg.y) then meta:set_int("y", msg.y) end
256-
if is_int(msg.z) then meta:set_int("z", msg.z) end
254+
if is_int(msg.x) then meta:set_int("x", jumpdrive.sanitize_coord(msg.x)) end
255+
if is_int(msg.y) then meta:set_int("y", jumpdrive.sanitize_coord(msg.y)) end
256+
if is_int(msg.z) then meta:set_int("z", jumpdrive.sanitize_coord(msg.z)) end
257257
if msg.formupdate then
258258
jumpdrive.fleet.update_formspec(meta, pos)
259259
end

0 commit comments

Comments
 (0)