evert
/
elepower
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix name changing

This commit is contained in:
Evert Prants 2018-08-02 20:09:32 +03:00
parent 4af53a9559
commit 51a96687b5
Signed by: evert
GPG Key ID: 1688DA83D222D0B5
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
elepower_wireless/machines/matter_receiver.lua
View File

@ -38,7 +38,7 @@ local function matter_receiver_timer(pos)
end
meta:set_string("formspec", get_formspec(pow_percent, name, player))
meta:set_string("infotext", "Matter Receiver\n" .. ele.capacity_text(capacity, storage))
meta:set_string("infotext", name .. "\n" .. ele.capacity_text(capacity, storage))
return false
end
@ -107,6 +107,10 @@ ele.register_machine("elepower_wireless:matter_receiver", {
if fields["name"] and fields["key_enter"] == "true" then
meta:set_string("name", fields["name"])
minetest.get_node_timer(pos):start(0.2)
local strname = minetest.pos_to_string(pos)
if not elewi.loaded_receivers[strname] then return end
elewi.loaded_receivers[strname].name = fields["name"]
end
end,
after_destruct = function (pos)

10
elepower_wireless/machines/matter_transmitter.lua
View File

@ -31,8 +31,9 @@ local function matter_transmitter_timer(pos)
local usage = ele.helpers.get_node_property(meta, pos, "usage")
local pow_percent = math.floor((storage / capacity) * 100)
local tpos = minetest.string_to_pos(target)
if storage >= usage then
if storage >= usage and tpos then
ele.helpers.swap_node(pos, "elepower_wireless:matter_transmitter_active")
else
ele.helpers.swap_node(pos, "elepower_wireless:matter_transmitter")
@ -44,7 +45,7 @@ local function matter_transmitter_timer(pos)
end
meta:set_string("formspec", get_formspec(pow_percent, name, player, target))
meta:set_string("infotext", "Matter Transmitter\n" .. ele.capacity_text(capacity, storage) .. extra)
meta:set_string("infotext", name .. "\n" .. ele.capacity_text(capacity, storage) .. extra)
return false
end
@ -112,6 +113,11 @@ ele.register_machine("elepower_wireless:matter_transmitter", {
local meta = minetest.get_meta(pos)
if fields["name"] and fields["key_enter"] == "true" then
meta:set_string("name", fields["name"])
minetest.get_node_timer(pos):start(0.2)
local strname = minetest.pos_to_string(pos)
if not elewi.loaded_transmitters[strname] then return end
elewi.loaded_transmitters[strname].name = fields["name"]
end
end,
after_destruct = function (pos)