From ff8bdf116726a35ad8ac4b6668b828c167a6adc4 Mon Sep 17 00:00:00 2001 From: rubenwardy Date: Thu, 12 Oct 2017 15:51:53 +0100 Subject: [PATCH] Clean up code --- init.lua | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/init.lua b/init.lua index 48dc176..4e71876 100644 --- a/init.lua +++ b/init.lua @@ -12,32 +12,35 @@ local hp_bar = { function hp_bar:on_step(dtime) local wielder = self.wielder - if wielder == nil then - self.object:remove() - return - elseif minetest.env:get_player_by_name(wielder:get_player_name()) == nil then + if wielder == nil or + minetest.get_player_by_name(wielder:get_player_name()) == nil then self.object:remove() return end - hp = wielder:get_hp() - breath = wielder:get_breath() - self.object:set_properties({textures = {"health_" .. tostring(hp) .. ".png^breath_" .. tostring(breath) .. ".png",},} - ) + + local hp = wielder:get_hp() + local breath = wielder:get_breath() + self.object:set_properties({ + textures = { + "health_" .. tostring(hp) .. ".png^breath_" .. tostring(breath) .. ".png", + }, + }) end minetest.register_entity("gauges:hp_bar", hp_bar) -function add_HP_gauge(pl) - local pos = pl:getpos() - local ent = minetest.env:add_entity(pos, "gauges:hp_bar") - if ent ~= nil then - ent:set_attach(pl, "", {x = 0, y = 10, z = 0}, {x = 0, y = 0, z = 0}) - ent = ent:get_luaentity() - ent.wielder = pl - end +local function add_HP_gauge(player) + local pos = player:get_pos() + local ent = minetest.add_entity(pos, "gauges:hp_bar") + if ent ~= nil then + ent:set_attach(player, "", {x = 0, y = 10, z = 0}, {x = 0, y = 0, z = 0}) + ent = ent:get_luaentity() + ent.wielder = player + end end -if minetest.setting_getbool("health_bars") ~= false -- “If not defined or set to true then” -and minetest.setting_getbool("enable_damage") then -- Health bars only display when damage is enabled. +-- If health_bars not defined or set to true +if minetest.setting_getbool("health_bars") ~= false and + minetest.setting_getbool("enable_damage") then minetest.register_on_joinplayer(add_HP_gauge) end