From cc7044671cc45e94a9ccabf62a1cfd3fd0626466 Mon Sep 17 00:00:00 2001 From: GreenXenith <24834740+GreenXenith@users.noreply.github.com> Date: Sun, 25 Nov 2018 15:24:02 -0800 Subject: [PATCH] Fix entity overloading and add missing entity check --- lcd.lua | 45 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 34 insertions(+), 11 deletions(-) diff --git a/lcd.lua b/lcd.lua index ce17dac..d034aa6 100644 --- a/lcd.lua +++ b/lcd.lua @@ -129,15 +129,29 @@ local clearscreen = function(pos) end local prepare_writing = function(pos) - local lcd_info = lcds[minetest.get_node(pos).param2] - if lcd_info == nil then return end - local text = minetest.add_entity( - {x = pos.x + lcd_info.delta.x, - y = pos.y + lcd_info.delta.y, - z = pos.z + lcd_info.delta.z}, "digilines_lcd:text") - text:setyaw(lcd_info.yaw or 0) - --* text:setpitch(lcd_info.yaw or 0) - return text + local existing + local objects = minetest.get_objects_inside_radius(pos, 0.5) + for _, o in ipairs(objects) do + local o_entity = o:get_luaentity() + if o_entity and o_entity.name == "digilines_lcd:text" then + existing = o_entity + break + end + end + if not existing or existing == nil then + local lcd_info = lcds[minetest.get_node(pos).param2] + if lcd_info == nil then return end + local text = minetest.add_entity( + {x = pos.x + lcd_info.delta.x, + y = pos.y + lcd_info.delta.y, + z = pos.z + lcd_info.delta.z}, "digilines_lcd:text") + text:setyaw(lcd_info.yaw or 0) + return text + else + local meta = minetest.get_meta(existing.object:getpos()) + local text = meta:get_string("text") + existing.object:set_properties({textures={generate_texture(create_lines(text))}}) + end end local on_digiline_receive = function(pos, _, channel, msg) @@ -178,7 +192,7 @@ minetest.register_node("digilines:lcd", { if param2 == 0 or param2 == 1 then minetest.add_node(pos, {name = "digilines:lcd", param2 = 3}) end - prepare_writing (pos) + prepare_writing(pos) end, on_construct = function(pos) @@ -211,11 +225,20 @@ minetest.register_node("digilines:lcd", { light_source = 6, }) +minetest.register_lbm({ + label = "Replace Missing Text Entities", + name = "digilines:replace_text", + nodenames = {"digilines:lcd"}, + run_at_every_load = true, + action = function(pos) + prepare_writing(pos) + end, +}) + minetest.register_entity(":digilines_lcd:text", { collisionbox = { 0, 0, 0, 0, 0, 0 }, visual = "upright_sprite", textures = {}, - on_activate = function(self) local meta = minetest.get_meta(self.object:getpos()) local text = meta:get_string("text")